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

annotate Objects/floatobject.c @ 60174:255a401c19b0

(partially) Merged revisions 79534,79537,79539,79558,79606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings. ........ r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines Fix typo ........ r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests. ........ r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote. ........ r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines Backport some robotparser test and skip the test if the external resource is not available. ........

author	Florent Xicluna <florent.xicluna@gmail.com>
date	Fri, 02 Apr 2010 18:52:12 +0000
parents	132d42348216
children	cab14be0ada1

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"
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 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>
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	11 #include <float.h>
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	13 #undef MAX
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	14 #undef MIN
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	15 #define MAX(x, y) ((x) < (y) ? (y) : (x))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	16 #define MIN(x, y) ((x) < (y) ? (x) : (y))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	17
60 4f593b38d061 Moved prototyes for fmod and pow, and don't use them for THINK C. Guido van Rossum <guido@python.org> parents: 46 diff changeset	18
44943 6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44674 diff changeset	19 #ifdef _OSF_SOURCE
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44674 diff changeset	20 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44674 diff changeset	21 extern int finite(double);
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44674 diff changeset	22 #endif
6547be11f443 Merged revisions 60245-60277 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44674 diff changeset	23
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	24 /* 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	25 #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	26 #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	27 #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	28
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 {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	30 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	31 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	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
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	34 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	35
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 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	37 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	38
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	39 static PyFloatObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	40 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	41 {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	42 PyFloatObject p, q;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	43 /* 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	44 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	45 if (p == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	46 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	47 ((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	48 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	49 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	50 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	51 while (--q > p)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	52 Py_TYPE(q) = (struct _typeobject *)(q-1);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	53 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	54 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	55 }
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	56
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	57 double
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	58 PyFloat_GetMax(void)
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	59 {
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	60 return DBL_MAX;
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	61 }
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	62
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	63 double
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	64 PyFloat_GetMin(void)
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	65 {
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	66 return DBL_MIN;
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	67 }
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	68
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	69 static PyTypeObject FloatInfoType;
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	70
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	71 PyDoc_STRVAR(floatinfo__doc__,
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54232 diff changeset	72 "sys.float_info\n\
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	73 \n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	74 A structseq holding information about the float type. It contains low level\n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	75 information about the precision and internal representation. Please study\n\
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	76 your system's :file:`float.h` for more information.");
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	77
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	78 static PyStructSequence_Field floatinfo_fields[] = {
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	79 {"max", "DBL_MAX -- maximum representable finite float"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	80 {"max_exp", "DBL_MAX_EXP -- maximum int e such that radix**(e-1) "
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	81 "is representable"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	82 {"max_10_exp", "DBL_MAX_10_EXP -- maximum int e such that 10**e "
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	83 "is representable"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	84 {"min", "DBL_MIN -- Minimum positive normalizer float"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	85 {"min_exp", "DBL_MIN_EXP -- minimum int e such that radix**(e-1) "
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	86 "is a normalized float"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	87 {"min_10_exp", "DBL_MIN_10_EXP -- minimum int e such that 10**e is "
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	88 "a normalized"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	89 {"dig", "DBL_DIG -- digits"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	90 {"mant_dig", "DBL_MANT_DIG -- mantissa digits"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	91 {"epsilon", "DBL_EPSILON -- Difference between 1 and the next "
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	92 "representable float"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	93 {"radix", "FLT_RADIX -- radix of exponent"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	94 {"rounds", "FLT_ROUNDS -- addition rounds"},
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	95 {0}
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	96 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	97
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	98 static PyStructSequence_Desc floatinfo_desc = {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54232 diff changeset	99 "sys.float_info", /* name */
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	100 floatinfo__doc__, /* doc */
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	101 floatinfo_fields, /* fields */
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	102 11
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	103 };
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	104
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	105 PyObject *
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	106 PyFloat_GetInfo(void)
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	107 {
45071 f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	108 PyObject* floatinfo;
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	109 int pos = 0;
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	110
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	111 floatinfo = PyStructSequence_New(&FloatInfoType);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	112 if (floatinfo == NULL) {
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	113 return NULL;
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	114 }
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	115
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	116 #define SetIntFlag(flag) \
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	117 PyStructSequence_SET_ITEM(floatinfo, pos++, PyLong_FromLong(flag))
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	118 #define SetDblFlag(flag) \
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	119 PyStructSequence_SET_ITEM(floatinfo, pos++, PyFloat_FromDouble(flag))
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	120
44674 1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	121 SetDblFlag(DBL_MAX);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	122 SetIntFlag(DBL_MAX_EXP);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	123 SetIntFlag(DBL_MAX_10_EXP);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	124 SetDblFlag(DBL_MIN);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	125 SetIntFlag(DBL_MIN_EXP);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	126 SetIntFlag(DBL_MIN_10_EXP);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	127 SetIntFlag(DBL_DIG);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	128 SetIntFlag(DBL_MANT_DIG);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	129 SetDblFlag(DBL_EPSILON);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	130 SetIntFlag(FLT_RADIX);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	131 SetIntFlag(FLT_ROUNDS);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	132 #undef SetIntFlag
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	133 #undef SetDblFlag
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	134
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	135 if (PyErr_Occurred()) {
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	136 Py_CLEAR(floatinfo);
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	137 return NULL;
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	138 }
1154158a199f Merged revisions 59933-59951 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	139 return floatinfo;
44086 110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	140 }
110ff614ec28 Merged revisions 59245-59254 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 43420 diff changeset	141
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	142 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	143 PyFloat_FromDouble(double fval)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	144 {
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	145 register PyFloatObject *op;
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 == NULL) {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	147 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	148 return NULL;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	149 }
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	150 /* 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	151 op = free_list;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	152 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	153 PyObject_INIT(op, &PyFloat_Type);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	154 op->ob_fval = fval;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	155 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	156 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	157
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	158 PyObject *
41229 1f843890a4e6 Remove the deprecated and useless "pend" argument from Georg Brandl <georg@python.org> parents: 40626 diff changeset	159 PyFloat_FromString(PyObject *v)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	160 {
53468 f76572108dd7 Internal plumbing changes for float parsing: Mark Dickinson <dickinsm@gmail.com> parents: 53241 diff changeset	161 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	162 double x;
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	163 char buffer[256]; /* for errors */
41725 d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	164 char *s_buffer = NULL;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	165 Py_ssize_t len;
41725 d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	166 PyObject *result = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	167
42854 824b9d52e006 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42817 diff changeset	168 if (PyUnicode_Check(v)) {
41725 d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	169 s_buffer = (char *)PyMem_MALLOC(PyUnicode_GET_SIZE(v)+1);
d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	170 if (s_buffer == NULL)
d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	171 return PyErr_NoMemory();
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	172 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	173 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	174 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	175 NULL))
42559 e781085ac989 Fix memory leak Neal Norwitz <nnorwitz@gmail.com> parents: 42477 diff changeset	176 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	177 s = s_buffer;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	178 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	179 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	180 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	181 PyErr_SetString(PyExc_TypeError,
56767 6d2396ea7b03 Fix extra-long line; also makes py3k match trunk here. Mark Dickinson <dickinsm@gmail.com> parents: 54918 diff changeset	182 "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	183 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	184 }
53468 f76572108dd7 Internal plumbing changes for float parsing: Mark Dickinson <dickinsm@gmail.com> parents: 53241 diff changeset	185 last = s + len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	186
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	187 while (Py_ISSPACE(*s))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	188 s++;
53468 f76572108dd7 Internal plumbing changes for float parsing: Mark Dickinson <dickinsm@gmail.com> parents: 53241 diff changeset	189 /* We don't care about overflow or underflow. If the platform
f76572108dd7 Internal plumbing changes for float parsing: Mark Dickinson <dickinsm@gmail.com> parents: 53241 diff changeset	190 * supports them, infinities and signed zeroes (on underflow) are
f76572108dd7 Internal plumbing changes for float parsing: Mark Dickinson <dickinsm@gmail.com> parents: 53241 diff changeset	191 * fine. */
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	192 x = PyOS_string_to_double(s, (char **)&end, NULL);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	193 if (x == -1.0 && PyErr_Occurred())
41725 d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	194 goto error;
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	195 while (Py_ISSPACE(*end))
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	196 end++;
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	197 if (end == last)
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	198 result = PyFloat_FromDouble(x);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	199 else {
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	200 PyOS_snprintf(buffer, sizeof(buffer),
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	201 "invalid literal for float(): %.200s", s);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	202 PyErr_SetString(PyExc_ValueError, buffer);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	203 result = NULL;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	204 }
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 53468 diff changeset	205
41725 d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	206 error:
d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	207 if (s_buffer)
d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	208 PyMem_FREE(s_buffer);
d1146d4db549 Make tset_float pass. float(<unicode>) was never very good -- it used Guido van Rossum <guido@python.org> parents: 41716 diff changeset	209 return result;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	210 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	211
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	212 static void
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	213 float_dealloc(PyFloatObject *op)
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	214 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	215 if (PyFloat_CheckExact(op)) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	216 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	217 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	218 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	219 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	220 Py_TYPE(op)->tp_free((PyObject *)op);
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	221 }
c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	222
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	223 double
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	224 PyFloat_AsDouble(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	225 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	226 PyNumberMethods *nb;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	227 PyFloatObject *fo;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	228 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	229
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	230 if (op && PyFloat_Check(op))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	231 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	232
26272 fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	233 if (op == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	234 PyErr_BadArgument();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	235 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	236 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	237
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	238 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	239 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	240 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	241 }
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	242
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	243 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	244 if (fo == NULL)
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	245 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	246 if (!PyFloat_Check(fo)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	247 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	248 "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	249 return -1;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	250 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	251
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	252 val = PyFloat_AS_DOUBLE(fo);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	253 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	254
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	255 return val;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	256 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	257
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	258 /* Macro and helper that convert PyObject obj to a C double and store
43420 0ff41b163f5b Remove more cruft leftover from nb_coerce. Rename nb_coerce to Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 43284 diff changeset	259 the value in dbl. If conversion to double raises an exception, obj is
21354 fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	260 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	261 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	262 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	263 */
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	264 #define CONVERT_TO_DOUBLE(obj, dbl) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	265 if (PyFloat_Check(obj)) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	266 dbl = PyFloat_AS_DOUBLE(obj); \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	267 else if (convert_to_double(&(obj), &(dbl)) < 0) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	268 return obj;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	269
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	270 /* Methods */
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	271
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	272 static int
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	273 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	274 {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	275 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	276
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	277 if (PyLong_Check(obj)) {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	278 *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	279 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	280 *v = NULL;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	281 return -1;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	282 }
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	283 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	284 else {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	285 Py_INCREF(Py_NotImplemented);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	286 *v = Py_NotImplemented;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	287 return -1;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	288 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	289 return 0;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	290 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	291
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	292 static PyObject *
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	293 float_str_or_repr(PyFloatObject *v, int precision, char format_code)
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	294 {
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	295 PyObject *result;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	296 char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v),
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	297 format_code, precision,
c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	298 Py_DTSF_ADD_DOT_0,
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	299 NULL);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	300 if (!buf)
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	301 return PyErr_NoMemory();
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	302 result = PyUnicode_FromString(buf);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	303 PyMem_Free(buf);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	304 return result;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	305 }
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	306
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	307 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	308 float_repr(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 {
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	310 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	311 }
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	312
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	313 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	314 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	315 {
53787 c6376d3fa968 Issue #5920: Changed format.__float__ and complex.__float__ to use a precision of 12 when using the empty presentation type. This more closely matches str()'s behavior and reduces surprises when adding alignment flags to an empty format string. Patch by Mark Dickinson. Eric Smith <eric@trueblade.com> parents: 53714 diff changeset	316 return float_str_or_repr(v, PyFloat_STR_PRECISION, 'g');
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	317 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	319 /* 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	320 * 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	321 * 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	322 * 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	323 * 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	324 * 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	325 * 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	326 * 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	327 * 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	328 * 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	329 * 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	330 * 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	331 * 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	332 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	333
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	334 static PyObject*
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	335 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	336 {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	337 double i, j;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	338 int r = 0;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	339
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	340 assert(PyFloat_Check(v));
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	341 i = PyFloat_AS_DOUBLE(v);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	342
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	343 /* 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	344 * 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	345 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	346 if (PyFloat_Check(w))
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	347 j = PyFloat_AS_DOUBLE(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	348
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	349 else if (!Py_IS_FINITE(i)) {
43124 727539865f04 Remove checking redundantly for checks of PyInt and PyLong. Neal Norwitz <nnorwitz@gmail.com> parents: 43104 diff changeset	350 if (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	351 /* 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	352 * 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	353 * 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	354 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	355 j = 0.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	356 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	357 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	358 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	359
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	360 else if (PyLong_Check(w)) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	361 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	362 int wsign = _PyLong_Sign(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	363 size_t nbits;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	364 int exponent;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	365
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	366 if (vsign != wsign) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	367 /* Magnitudes are irrelevant -- the signs alone
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	368 * determine the outcome.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	369 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	370 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	371 j = (double)wsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	372 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	373 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	374 /* The signs are the same. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	375 /* 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	376 nbits = _PyLong_NumBits(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	377 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	378 /* 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	379 * 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	380 * 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	381 * 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	382 * finite float.
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	383 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	384 PyErr_Clear();
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	385 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	386 assert(wsign != 0);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	387 j = wsign * 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	388 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	389 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	390 if (nbits <= 48) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	391 j = PyLong_AsDouble(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	392 /* 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	393 assert(j != -1.0 \|\| ! PyErr_Occurred());
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	394 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	395 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	396 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	397 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	398 * 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	399 * vsign != wsign branch at the start */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	400 /* 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	401 if (vsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	402 /* "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	403 * comparator.
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 i = -i;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	406 op = _Py_SwappedOp[op];
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	407 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	408 assert(i > 0.0);
36235 9f66bdd5a061 Fix icc warnings: remove unused variable Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	409 (void) frexp(i, &exponent);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	410 /* 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	411 * 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	412 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	413 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	414 i = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	415 j = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	416 goto Compare;
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 ((size_t)exponent > nbits) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	419 i = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	420 j = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	421 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	422 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	423 /* 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	424 * 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	425 * outcome.
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 {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	428 double fracpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	429 double intpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	430 PyObject *result = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	431 PyObject *one = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	432 PyObject *vv = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	433 PyObject *ww = w;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	434
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	435 if (wsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	436 ww = PyNumber_Negative(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	437 if (ww == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	438 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	439 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	440 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	441 Py_INCREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	442
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	443 fracpart = modf(i, &intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	444 vv = PyLong_FromDouble(intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	445 if (vv == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	446 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	447
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	448 if (fracpart != 0.0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	449 /* 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	450 * to represent the lost fraction.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	451 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	452 PyObject *temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	453
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44086 diff changeset	454 one = PyLong_FromLong(1);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	455 if (one == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	456 goto Error;
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 temp = PyNumber_Lshift(ww, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	459 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	460 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	461 Py_DECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	462 ww = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	463
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	464 temp = PyNumber_Lshift(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	465 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	466 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	467 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	468 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	469
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	470 temp = PyNumber_Or(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	471 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	472 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	473 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	474 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	475 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	476
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	477 r = PyObject_RichCompareBool(vv, ww, op);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	478 if (r < 0)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	479 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	480 result = PyBool_FromLong(r);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	481 Error:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	482 Py_XDECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	483 Py_XDECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	484 Py_XDECREF(one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	485 return result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	486 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	487 } /* else if (PyLong_Check(w)) */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	488
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	489 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	490 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	491
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	492 Compare:
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	493 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	494 switch (op) {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	495 case Py_EQ:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	496 r = i == j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	497 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	498 case Py_NE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	499 r = i != j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	500 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	501 case Py_LE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	502 r = i <= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	503 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	504 case Py_GE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	505 r = i >= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	506 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	507 case Py_LT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	508 r = i < j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	509 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	510 case Py_GT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	511 r = i > j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	512 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	513 }
31589 ca3c998afa55 Pass a variable that actually exists to PyFPE_END_PROTECT in Michael W. Hudson <mwh@python.net> parents: 31553 diff changeset	514 PyFPE_END_PROTECT(r)
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	515 return PyBool_FromLong(r);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	516
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	517 Unimplemented:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	518 Py_INCREF(Py_NotImplemented);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	519 return Py_NotImplemented;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	520 }
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	521
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	522 static long
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	523 float_hash(PyFloatObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	524 {
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	525 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	526 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	527
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	528 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	529 float_add(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	530 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	531 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	532 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	533 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	534 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	535 a = a + b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	536 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	537 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	538 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	539
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	540 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	541 float_sub(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	542 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	543 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	544 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	545 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	546 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	547 a = a - b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	548 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	549 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	550 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	551
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	552 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	553 float_mul(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	554 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	555 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	556 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	557 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	558 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	559 a = a * b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	560 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	561 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	562 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	563
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	564 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	565 float_div(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	566 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	567 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	568 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	569 CONVERT_TO_DOUBLE(w, b);
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	570 #ifdef Py_NAN
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	571 if (b == 0.0) {
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	572 PyErr_SetString(PyExc_ZeroDivisionError,
59014 132d42348216 Merged revisions 78319 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58006 diff changeset	573 "float division by zero");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	574 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	575 }
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	576 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	577 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	578 a = a / b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	579 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	580 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	581 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	582
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	583 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	584 float_rem(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	585 {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	586 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	587 double mod;
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	588 CONVERT_TO_DOUBLE(v, vx);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	589 CONVERT_TO_DOUBLE(w, wx);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	590 #ifdef Py_NAN
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	591 if (wx == 0.0) {
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	592 PyErr_SetString(PyExc_ZeroDivisionError,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	593 "float modulo");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	595 }
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	596 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	597 PyFPE_START_PROTECT("modulo", return 0)
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	598 mod = fmod(vx, wx);
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	599 /* note: checking mod*wx < 0 is incorrect -- underflows to
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	600 0 if wx < sqrt(smallest nonzero double) */
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	601 if (mod && ((wx < 0) != (mod < 0))) {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	602 mod += wx;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	603 }
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	604 PyFPE_END_PROTECT(mod)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	605 return PyFloat_FromDouble(mod);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	606 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	607
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	608 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	609 float_divmod(PyObject v, PyObject w)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	610 {
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	611 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	612 double div, mod, floordiv;
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	613 CONVERT_TO_DOUBLE(v, vx);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	614 CONVERT_TO_DOUBLE(w, wx);
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	615 if (wx == 0.0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	616 PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	617 return NULL;
caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	618 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	619 PyFPE_START_PROTECT("divmod", return 0)
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	620 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	621 /* 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	622 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	623 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	624 not be an exact integral value after the division, although
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	625 it will always be very close to one.
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	626 */
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	627 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	628 if (mod) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	629 /* 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	630 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	631 mod += wx;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	632 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	633 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	634 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	635 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	636 /* 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	637 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	638 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	639 "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	640 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	641 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	642 mod = -mod;
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	643 }
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	644 /* 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	645 if (div) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	646 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	647 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	648 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	649 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	650 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	651 /* 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	652 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	653 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	654 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	655 PyFPE_END_PROTECT(floordiv)
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	656 return Py_BuildValue("(dd)", floordiv, mod);
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	657 }
7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	658
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	659 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	660 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	661 {
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	662 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	663
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	664 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	665 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	666 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	667 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	668 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	669 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	670 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	671 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	672 }
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	673
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	674 /* determine whether x is an odd integer or not; assumes that
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	675 x is not an infinity or nan. */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	676 #define DOUBLE_IS_ODD_INTEGER(x) (fmod(fabs(x), 2.0) == 1.0)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	677
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	678 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	679 float_pow(PyObject v, PyObject w, PyObject *z)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	680 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	681 double iv, iw, ix;
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	682 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	683
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	684 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	685 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	686 "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	687 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	688 }
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	689
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	690 CONVERT_TO_DOUBLE(v, iv);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	691 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	692
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	693 /* Sort out special cases here instead of relying on pow() */
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	694 if (iw == 0) { /* v0 is 1, even 00 */
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41587 diff changeset	695 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	696 }
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	697 if (Py_IS_NAN(iv)) { /* nan*w = nan, unless w == 0 /
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	698 return PyFloat_FromDouble(iv);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	699 }
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	700 if (Py_IS_NAN(iw)) { /* vnan = nan, unless v == 1; 1nan = 1 */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	701 return PyFloat_FromDouble(iv == 1.0 ? 1.0 : iw);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	702 }
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	703 if (Py_IS_INFINITY(iw)) {
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	704 /* v**inf is: 0.0 if abs(v) < 1; 1.0 if abs(v) == 1; inf if
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	705 * abs(v) > 1 (including case where v infinite)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	706 *
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	707 * v**-inf is: inf if abs(v) < 1; 1.0 if abs(v) == 1; 0.0 if
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	708 * abs(v) > 1 (including case where v infinite)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	709 */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	710 iv = fabs(iv);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	711 if (iv == 1.0)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	712 return PyFloat_FromDouble(1.0);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	713 else if ((iw > 0.0) == (iv > 1.0))
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	714 return PyFloat_FromDouble(fabs(iw)); /* return inf */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	715 else
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	716 return PyFloat_FromDouble(0.0);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	717 }
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	718 if (Py_IS_INFINITY(iv)) {
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	719 /* (+-inf)**w is: inf for w positive, 0 for w negative; in
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	720 * both cases, we need to add the appropriate sign if w is
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	721 * an odd integer.
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	722 */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	723 int iw_is_odd = DOUBLE_IS_ODD_INTEGER(iw);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	724 if (iw > 0.0)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	725 return PyFloat_FromDouble(iw_is_odd ? iv : fabs(iv));
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	726 else
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	727 return PyFloat_FromDouble(iw_is_odd ?
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	728 copysign(0.0, iv) : 0.0);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	729 }
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	730 if (iv == 0.0) { /* 0**w is: 0 for w positive, 1 for w zero
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	731 (already dealt with above), and an error
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	732 if w is negative. */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	733 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	734 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	735 PyErr_SetString(PyExc_ZeroDivisionError,
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	736 "0.0 cannot be raised to a "
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	737 "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	738 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	739 }
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	740 /* use correct sign if iw is odd */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	741 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	742 }
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	743
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	744 if (iv < 0.0) {
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	745 /* 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	746 * 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	747 */
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	748 if (iw != floor(iw)) {
43284 1f9eee08ab35 Check in some documentation tweaks for PEP 3141, add some tests, and implement Jeffrey Yasskin <jyasskin@gmail.com> parents: 43124 diff changeset	749 /* Negative numbers raised to fractional powers
1f9eee08ab35 Check in some documentation tweaks for PEP 3141, add some tests, and implement Jeffrey Yasskin <jyasskin@gmail.com> parents: 43124 diff changeset	750 * become complex.
1f9eee08ab35 Check in some documentation tweaks for PEP 3141, add some tests, and implement Jeffrey Yasskin <jyasskin@gmail.com> parents: 43124 diff changeset	751 */
1f9eee08ab35 Check in some documentation tweaks for PEP 3141, add some tests, and implement Jeffrey Yasskin <jyasskin@gmail.com> parents: 43124 diff changeset	752 return PyComplex_Type.tp_as_number->nb_power(v, w, z);
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	753 }
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	754 /* iw is an exact integer, albeit perhaps a very large
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	755 * one. Replace iv by its absolute value and remember
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	756 * to negate the pow result if iw is odd.
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	757 */
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	758 iv = -iv;
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	759 negate_result = DOUBLE_IS_ODD_INTEGER(iw);
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	760 }
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	761
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	762 if (iv == 1.0) { /* 1w is 1, even 1inf and 1*nan /
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	763 /* (-1) ** large_integer also ends up here. Here's an
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	764 * extract from the comments for the previous
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	765 * implementation explaining why this special case is
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	766 * necessary:
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	767 *
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	768 * -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	769 * 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	770 * 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	771 * happen to be representable in a C integer. That's a
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	772 * bug.
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	773 */
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	774 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	775 }
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	776
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	777 /* Now iv and iw are finite, iw is nonzero, and iv is
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	778 * positive and not equal to 1.0. We finally allow
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	779 * the platform pow to step in and do the rest.
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	780 */
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	781 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	782 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	783 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	784 PyFPE_END_PROTECT(ix)
22228 4b6eda7d0c8f backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21354 diff changeset	785 Py_ADJUST_ERANGE1(ix);
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	786 if (negate_result)
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	787 ix = -ix;
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	788
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	789 if (errno != 0) {
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	790 /* 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	791 * 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	792 */
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	793 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	794 PyExc_ValueError);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	795 return NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	796 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	797 return PyFloat_FromDouble(ix);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	798 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	799
58006 740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	800 #undef DOUBLE_IS_ODD_INTEGER
740dbae2e30c Merged revisions 77139-77140 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 57487 diff changeset	801
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	802 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	803 float_neg(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	804 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	805 return PyFloat_FromDouble(-v->ob_fval);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	806 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	807
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	808 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	809 float_abs(PyFloatObject *v)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	810 {
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	811 return PyFloat_FromDouble(fabs(v->ob_fval));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	812 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	813
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	814 static int
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39603 diff changeset	815 float_bool(PyFloatObject *v)
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	816 {
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	817 return v->ob_fval != 0.0;
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	818 }
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	819
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	820 static PyObject *
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	821 float_is_integer(PyObject *v)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	822 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	823 double x = PyFloat_AsDouble(v);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	824 PyObject *o;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	825
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	826 if (x == -1.0 && PyErr_Occurred())
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	827 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	828 if (!Py_IS_FINITE(x))
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	829 Py_RETURN_FALSE;
46790 17cd612b06da Issue 2801: fix bug in float.is_integer where ValueError was incorrectly Mark Dickinson <dickinsm@gmail.com> parents: 46477 diff changeset	830 errno = 0;
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	831 PyFPE_START_PROTECT("is_integer", return NULL)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	832 o = (floor(x) == x) ? Py_True : Py_False;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	833 PyFPE_END_PROTECT(x)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	834 if (errno != 0) {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	835 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	836 PyExc_ValueError);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	837 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	838 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	839 Py_INCREF(o);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	840 return o;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	841 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	842
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	843 #if 0
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	844 static PyObject *
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	845 float_is_inf(PyObject *v)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	846 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	847 double x = PyFloat_AsDouble(v);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	848 if (x == -1.0 && PyErr_Occurred())
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	849 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	850 return PyBool_FromLong((long)Py_IS_INFINITY(x));
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	851 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	852
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	853 static PyObject *
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	854 float_is_nan(PyObject *v)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	855 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	856 double x = PyFloat_AsDouble(v);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	857 if (x == -1.0 && PyErr_Occurred())
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	858 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	859 return PyBool_FromLong((long)Py_IS_NAN(x));
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	860 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	861
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	862 static PyObject *
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	863 float_is_finite(PyObject *v)
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	864 {
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	865 double x = PyFloat_AsDouble(v);
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	866 if (x == -1.0 && PyErr_Occurred())
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	867 return NULL;
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	868 return PyBool_FromLong((long)Py_IS_FINITE(x));
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	869 }
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	870 #endif
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	871
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	872 static PyObject *
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	873 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	874 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	875 double x = PyFloat_AsDouble(v);
18838 a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	876 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	877
a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	878 (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	879 /* 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	880 * 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	881 * 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	882 * 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	883 * 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	884 * 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	885 * 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	886 * 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	887 * 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	888 * 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	889 * 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	890 */
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	891 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	892 const long aslong = (long)wholepart;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44086 diff changeset	893 return PyLong_FromLong(aslong);
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20277 diff changeset	894 }
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	895 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	896 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	897
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	898 /* double_round: rounds a finite double to the closest multiple of
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	899 10**-ndigits; here ndigits is within reasonable bounds (typically, -308 <=
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	900 ndigits <= 323). Returns a Python float, or sets a Python error and
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	901 returns NULL on failure (OverflowError and memory errors are possible). */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	902
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	903 #ifndef PY_NO_SHORT_FLOAT_REPR
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	904 /* version of double_round that uses the correctly-rounded string<->double
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	905 conversions from Python/dtoa.c */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	906
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	907 static PyObject *
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	908 double_round(double x, int ndigits) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	909
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	910 double rounded;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	911 Py_ssize_t buflen, mybuflen=100;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	912 char buf, buf_end, shortbuf[100], *mybuf=shortbuf;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	913 int decpt, sign;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	914 PyObject *result = NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	915
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	916 /* round to a decimal string */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	917 buf = _Py_dg_dtoa(x, 3, ndigits, &decpt, &sign, &buf_end);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	918 if (buf == NULL) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	919 PyErr_NoMemory();
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	920 return NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	921 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	922
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	923 /* Get new buffer if shortbuf is too small. Space needed <= buf_end -
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	924 buf + 8: (1 extra for '0', 1 for sign, 5 for exp, 1 for '\0'). */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	925 buflen = buf_end - buf;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	926 if (buflen + 8 > mybuflen) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	927 mybuflen = buflen+8;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	928 mybuf = (char *)PyMem_Malloc(mybuflen);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	929 if (mybuf == NULL) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	930 PyErr_NoMemory();
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	931 goto exit;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	932 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	933 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	934 /* copy buf to mybuf, adding exponent, sign and leading 0 */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	935 PyOS_snprintf(mybuf, mybuflen, "%s0%se%d", (sign ? "-" : ""),
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	936 buf, decpt - (int)buflen);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	937
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	938 /* and convert the resulting string back to a double */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	939 errno = 0;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	940 rounded = _Py_dg_strtod(mybuf, NULL);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	941 if (errno == ERANGE && fabs(rounded) >= 1.)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	942 PyErr_SetString(PyExc_OverflowError,
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	943 "rounded value too large to represent");
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	944 else
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	945 result = PyFloat_FromDouble(rounded);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	946
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	947 /* done computing value; now clean up */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	948 if (mybuf != shortbuf)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	949 PyMem_Free(mybuf);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	950 exit:
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	951 _Py_dg_freedtoa(buf);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	952 return result;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	953 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	954
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	955 #else /* PY_NO_SHORT_FLOAT_REPR */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	956
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	957 /* fallback version, to be used when correctly rounded binary<->decimal
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	958 conversions aren't available */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	959
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	960 static PyObject *
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	961 double_round(double x, int ndigits) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	962 double pow1, pow2, y, z;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	963 if (ndigits >= 0) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	964 if (ndigits > 22) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	965 /* pow1 and pow2 are each safe from overflow, but
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	966 pow1pow2 ~= pow(10.0, ndigits) might overflow /
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	967 pow1 = pow(10.0, (double)(ndigits-22));
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	968 pow2 = 1e22;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	969 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	970 else {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	971 pow1 = pow(10.0, (double)ndigits);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	972 pow2 = 1.0;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	973 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	974 y = (xpow1)pow2;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	975 /* if y overflows, then rounded value is exactly x */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	976 if (!Py_IS_FINITE(y))
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	977 return PyFloat_FromDouble(x);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	978 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	979 else {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	980 pow1 = pow(10.0, (double)-ndigits);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	981 pow2 = 1.0; /* unused; silences a gcc compiler warning */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	982 y = x / pow1;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	983 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	984
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	985 z = round(y);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	986 if (fabs(y-z) == 0.5)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	987 /* halfway between two integers; use round-half-even */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	988 z = 2.0*round(y/2.0);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	989
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	990 if (ndigits >= 0)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	991 z = (z / pow2) / pow1;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	992 else
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	993 z *= pow1;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	994
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	995 /* if computation resulted in overflow, raise OverflowError */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	996 if (!Py_IS_FINITE(z)) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	997 PyErr_SetString(PyExc_OverflowError,
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	998 "overflow occurred during round");
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	999 return NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1000 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1001
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1002 return PyFloat_FromDouble(z);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1003 }
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1004
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1005 #endif /* PY_NO_SHORT_FLOAT_REPR */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1006
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1007 /* round a Python float v to the closest multiple of 10*-ndigits /
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1008
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1009 static PyObject *
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1010 float_round(PyObject v, PyObject args)
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1011 {
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1012 double x, rounded;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1013 PyObject *o_ndigits = NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1014 Py_ssize_t ndigits;
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1015
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1016 x = PyFloat_AsDouble(v);
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1017 if (!PyArg_ParseTuple(args, "\|O", &o_ndigits))
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1018 return NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1019 if (o_ndigits == NULL) {
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1020 /* single-argument round: round to nearest integer */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1021 rounded = round(x);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1022 if (fabs(x-rounded) == 0.5)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1023 /* halfway case: round to even */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1024 rounded = 2.0*round(x/2.0);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1025 return PyLong_FromDouble(rounded);
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1026 }
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1027
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1028 /* interpret second argument as a Py_ssize_t; clips on overflow */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1029 ndigits = PyNumber_AsSsize_t(o_ndigits, NULL);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1030 if (ndigits == -1 && PyErr_Occurred())
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1031 return NULL;
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1032
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1033 /* nans and infinities round to themselves */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1034 if (!Py_IS_FINITE(x))
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1035 return PyFloat_FromDouble(x);
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1036
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1037 /* Deal with extreme values for ndigits. For ndigits > NDIGITS_MAX, x
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1038 always rounds to itself. For ndigits < NDIGITS_MIN, x always
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1039 rounds to +-0.0. Here 0.30103 is an upper bound for log10(2). */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1040 #define NDIGITS_MAX ((int)((DBL_MANT_DIG-DBL_MIN_EXP) * 0.30103))
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1041 #define NDIGITS_MIN (-(int)((DBL_MAX_EXP + 1) * 0.30103))
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1042 if (ndigits > NDIGITS_MAX)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1043 /* return x */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1044 return PyFloat_FromDouble(x);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1045 else if (ndigits < NDIGITS_MIN)
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1046 /* return 0.0, but with sign of x */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1047 return PyFloat_FromDouble(0.0*x);
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1048 else
53218 d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1049 /* finite x, and ndigits is not unreasonably large */
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1050 return double_round(x, (int)ndigits);
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1051 #undef NDIGITS_MAX
d43d64252d36 Issue #1869 (and 4707, 5118, 5473, 1456775): use the new Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	1052 #undef NDIGITS_MIN
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1053 }
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1054
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1055 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1056 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	1057 {
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1058 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	1059 Py_INCREF(v);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1060 else
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1061 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	1062 return v;
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1063 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1064
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1065 /* turn ASCII hex characters into integer values and vice versa */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1066
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1067 static char
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1068 char_from_hex(int x)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1069 {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1070 assert(0 <= x && x < 16);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1071 return "0123456789abcdef"[x];
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1072 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1073
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1074 static int
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1075 hex_from_char(char c) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1076 int x;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1077 switch(c) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1078 case '0':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1079 x = 0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1080 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1081 case '1':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1082 x = 1;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1083 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1084 case '2':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1085 x = 2;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1086 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1087 case '3':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1088 x = 3;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1089 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1090 case '4':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1091 x = 4;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1092 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1093 case '5':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1094 x = 5;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1095 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1096 case '6':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1097 x = 6;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1098 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1099 case '7':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1100 x = 7;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1101 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1102 case '8':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1103 x = 8;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1104 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1105 case '9':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1106 x = 9;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1107 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1108 case 'a':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1109 case 'A':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1110 x = 10;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1111 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1112 case 'b':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1113 case 'B':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1114 x = 11;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1115 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1116 case 'c':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1117 case 'C':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1118 x = 12;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1119 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1120 case 'd':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1121 case 'D':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1122 x = 13;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1123 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1124 case 'e':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1125 case 'E':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1126 x = 14;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1127 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1128 case 'f':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1129 case 'F':
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1130 x = 15;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1131 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1132 default:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1133 x = -1;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1134 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1135 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1136 return x;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1137 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1138
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1139 /* convert a float to a hexadecimal string */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1140
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1141 /* TOHEX_NBITS is DBL_MANT_DIG rounded up to the next integer
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1142 of the form 4k+1. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1143 #define TOHEX_NBITS DBL_MANT_DIG + 3 - (DBL_MANT_DIG+2)%4
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1144
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1145 static PyObject *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1146 float_hex(PyObject *v)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1147 {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1148 double x, m;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1149 int e, shift, i, si, esign;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1150 /* Space for 1+(TOHEX_NBITS-1)/4 digits, a decimal point, and the
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1151 trailing NUL byte. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1152 char s[(TOHEX_NBITS-1)/4+3];
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1153
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1154 CONVERT_TO_DOUBLE(v, x);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1155
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1156 if (Py_IS_NAN(x) \|\| Py_IS_INFINITY(x))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1157 return float_str((PyFloatObject *)v);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1158
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1159 if (x == 0.0) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1160 if(copysign(1.0, x) == -1.0)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1161 return PyUnicode_FromString("-0x0.0p+0");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1162 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1163 return PyUnicode_FromString("0x0.0p+0");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1164 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1165
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1166 m = frexp(fabs(x), &e);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1167 shift = 1 - MAX(DBL_MIN_EXP - e, 0);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1168 m = ldexp(m, shift);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1169 e -= shift;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1170
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1171 si = 0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1172 s[si] = char_from_hex((int)m);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1173 si++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1174 m -= (int)m;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1175 s[si] = '.';
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1176 si++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1177 for (i=0; i < (TOHEX_NBITS-1)/4; i++) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1178 m *= 16.0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1179 s[si] = char_from_hex((int)m);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1180 si++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1181 m -= (int)m;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1182 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1183 s[si] = '\0';
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1184
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1185 if (e < 0) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1186 esign = (int)'-';
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1187 e = -e;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1188 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1189 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1190 esign = (int)'+';
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1191
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1192 if (x < 0.0)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1193 return PyUnicode_FromFormat("-0x%sp%c%d", s, esign, e);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1194 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1195 return PyUnicode_FromFormat("0x%sp%c%d", s, esign, e);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1196 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1197
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1198 PyDoc_STRVAR(float_hex_doc,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1199 "float.hex() -> string\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1200 \n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1201 Return a hexadecimal representation of a floating-point number.\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1202 >>> (-0.1).hex()\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1203 '-0x1.999999999999ap-4'\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1204 >>> 3.14159.hex()\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1205 '0x1.921f9f01b866ep+1'");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1206
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1207 /* Convert a hexadecimal string to a float. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1208
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1209 static PyObject *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1210 float_fromhex(PyObject cls, PyObject arg)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1211 {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1212 PyObject result_as_float, result;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1213 double x;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1214 long exp, top_exp, lsb, key_digit;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1215 char s, coeff_start, s_store, coeff_end, exp_start, s_end;
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1216 int half_eps, digit, round_up, negate=0;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1217 Py_ssize_t length, ndigits, fdigits, i;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1218
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1219 /*
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1220 * For the sake of simplicity and correctness, we impose an artificial
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1221 * limit on ndigits, the total number of hex digits in the coefficient
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1222 * The limit is chosen to ensure that, writing exp for the exponent,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1223 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1224 * (1) if exp > LONG_MAX/2 then the value of the hex string is
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1225 * guaranteed to overflow (provided it's nonzero)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1226 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1227 * (2) if exp < LONG_MIN/2 then the value of the hex string is
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1228 * guaranteed to underflow to 0.
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1229 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1230 * (3) if LONG_MIN/2 <= exp <= LONG_MAX/2 then there's no danger of
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1231 * overflow in the calculation of exp and top_exp below.
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1232 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1233 * More specifically, ndigits is assumed to satisfy the following
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1234 * inequalities:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1235 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1236 * 4*ndigits <= DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1237 * 4*ndigits <= LONG_MAX/2 + 1 - DBL_MAX_EXP
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1238 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1239 * If either of these inequalities is not satisfied, a ValueError is
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1240 * raised. Otherwise, write x for the value of the hex string, and
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1241 * assume x is nonzero. Then
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1242 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1243 * 2*(exp-4ndigits) <= \|x\| < 2*(exp+4ndigits).
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1244 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1245 * Now if exp > LONG_MAX/2 then:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1246 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1247 * exp - 4*ndigits >= LONG_MAX/2 + 1 - (LONG_MAX/2 + 1 - DBL_MAX_EXP)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1248 * = DBL_MAX_EXP
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1249 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1250 * so \|x\| >= 2**DBL_MAX_EXP, which is too large to be stored in C
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1251 * double, so overflows. If exp < LONG_MIN/2, then
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1252 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1253 * exp + 4*ndigits <= LONG_MIN/2 - 1 + (
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1254 * DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1255 * = DBL_MIN_EXP - DBL_MANT_DIG - 1
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1256 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1257 * and so \|x\| < 2**(DBL_MIN_EXP-DBL_MANT_DIG-1), hence underflows to 0
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1258 * when converted to a C double.
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1259 *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1260 * It's easy to show that if LONG_MIN/2 <= exp <= LONG_MAX/2 then both
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1261 * exp+4ndigits and exp-4ndigits are within the range of a long.
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1262 */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1263
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48553 diff changeset	1264 s = _PyUnicode_AsStringAndSize(arg, &length);
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1265 if (s == NULL)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1266 return NULL;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1267 s_end = s + length;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1268
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1269 /********************
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1270 * Parse the string *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1271 ********************/
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1272
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1273 /* leading whitespace */
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	1274 while (Py_ISSPACE(*s))
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1275 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1276
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1277 /* infinities and nans */
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1278 x = _Py_parse_inf_or_nan(s, &coeff_end);
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1279 if (coeff_end != s) {
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1280 s = coeff_end;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1281 goto finished;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1282 }
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1283
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1284 /* optional sign */
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1285 if (*s == '-') {
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1286 s++;
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1287 negate = 1;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1288 }
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1289 else if (*s == '+')
4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1290 s++;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1291
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1292 /* [0x] */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1293 s_store = s;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1294 if (*s == '0') {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1295 s++;
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	1296 if (s == 'x' \|\| s == 'X')
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1297 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1298 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1299 s = s_store;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1300 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1301
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1302 /* coefficient: <integer> [. <fraction>] */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1303 coeff_start = s;
48819 a8d69c1a3f4e Merged revisions 65964 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48734 diff changeset	1304 while (hex_from_char(*s) >= 0)
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1305 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1306 s_store = s;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1307 if (*s == '.') {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1308 s++;
48819 a8d69c1a3f4e Merged revisions 65964 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48734 diff changeset	1309 while (hex_from_char(*s) >= 0)
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1310 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1311 coeff_end = s-1;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1312 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1313 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1314 coeff_end = s;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1315
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1316 /* ndigits = total # of hex digits; fdigits = # after point */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1317 ndigits = coeff_end - coeff_start;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1318 fdigits = coeff_end - s_store;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1319 if (ndigits == 0)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1320 goto parse_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1321 if (ndigits > MIN(DBL_MIN_EXP - DBL_MANT_DIG - LONG_MIN/2,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1322 LONG_MAX/2 + 1 - DBL_MAX_EXP)/4)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1323 goto insane_length_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1324
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1325 /* [p <exponent>] */
53714 e2b553d7205f Merged revisions 72253 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53707 diff changeset	1326 if (s == 'p' \|\| s == 'P') {
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1327 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1328 exp_start = s;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1329 if (s == '-' \|\| s == '+')
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1330 s++;
48819 a8d69c1a3f4e Merged revisions 65964 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48734 diff changeset	1331 if (!('0' <= s && s <= '9'))
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1332 goto parse_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1333 s++;
48819 a8d69c1a3f4e Merged revisions 65964 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48734 diff changeset	1334 while ('0' <= s && s <= '9')
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1335 s++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1336 exp = strtol(exp_start, NULL, 10);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1337 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1338 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1339 exp = 0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1340
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1341 /* for 0 <= j < ndigits, HEX_DIGIT(j) gives the jth most significant digit */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1342 #define HEX_DIGIT(j) hex_from_char(*((j) < fdigits ? \
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1343 coeff_end-(j) : \
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1344 coeff_end-1-(j)))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1345
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1346 /*******************************************
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1347 * Compute rounded value of the hex string *
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1348 *******************************************/
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1349
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1350 /* Discard leading zeros, and catch extreme overflow and underflow */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1351 while (ndigits > 0 && HEX_DIGIT(ndigits-1) == 0)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1352 ndigits--;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1353 if (ndigits == 0 \|\| exp < LONG_MIN/2) {
54001 9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1354 x = 0.0;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1355 goto finished;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1356 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1357 if (exp > LONG_MAX/2)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1358 goto overflow_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1359
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1360 /* Adjust exponent for fractional part. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1361 exp = exp - 4*((long)fdigits);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1362
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1363 /* top_exp = 1 more than exponent of most sig. bit of coefficient */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1364 top_exp = exp + 4*((long)ndigits - 1);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1365 for (digit = HEX_DIGIT(ndigits-1); digit != 0; digit /= 2)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1366 top_exp++;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1367
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1368 /* catch almost all nonextreme cases of overflow and underflow here */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1369 if (top_exp < DBL_MIN_EXP - DBL_MANT_DIG) {
54001 9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1370 x = 0.0;
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1371 goto finished;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1372 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1373 if (top_exp > DBL_MAX_EXP)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1374 goto overflow_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1375
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1376 /* lsb = exponent of least significant bit of the rounded value.
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1377 This is top_exp - DBL_MANT_DIG unless result is subnormal. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1378 lsb = MAX(top_exp, (long)DBL_MIN_EXP) - DBL_MANT_DIG;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1379
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1380 x = 0.0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1381 if (exp >= lsb) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1382 /* no rounding required */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1383 for (i = ndigits-1; i >= 0; i--)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1384 x = 16.0*x + HEX_DIGIT(i);
54001 9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1385 x = ldexp(x, (int)(exp));
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1386 goto finished;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1387 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1388 /* rounding required. key_digit is the index of the hex digit
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1389 containing the first bit to be rounded away. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1390 half_eps = 1 << (int)((lsb - exp - 1) % 4);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1391 key_digit = (lsb - exp - 1) / 4;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1392 for (i = ndigits-1; i > key_digit; i--)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1393 x = 16.0*x + HEX_DIGIT(i);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1394 digit = HEX_DIGIT(key_digit);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1395 x = 16.0x + (double)(digit & (16-2half_eps));
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1396
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1397 /* round-half-even: round up if bit lsb-1 is 1 and at least one of
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1398 bits lsb, lsb-2, lsb-3, lsb-4, ... is 1. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1399 if ((digit & half_eps) != 0) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1400 round_up = 0;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1401 if ((digit & (3*half_eps-1)) != 0 \|\|
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1402 (half_eps == 8 && (HEX_DIGIT(key_digit+1) & 1) != 0))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1403 round_up = 1;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1404 else
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1405 for (i = key_digit-1; i >= 0; i--)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1406 if (HEX_DIGIT(i) != 0) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1407 round_up = 1;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1408 break;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1409 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1410 if (round_up == 1) {
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1411 x += 2*half_eps;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1412 if (top_exp == DBL_MAX_EXP &&
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1413 x == ldexp((double)(2*half_eps), DBL_MANT_DIG))
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1414 /* overflow corner case: pre-rounded value <
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1415 2DBL_MAX_EXP; rounded=2DBL_MAX_EXP. */
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1416 goto overflow_error;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1417 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1418 }
54001 9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1419 x = ldexp(x, (int)(exp+4*key_digit));
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1420
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1421 finished:
54001 9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1422 /* optional trailing whitespace leading to the end of the string */
9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1423 while (Py_ISSPACE(*s))
9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1424 s++;
9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1425 if (s != s_end)
9414c2b1923e Merged revisions 72564 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 53787 diff changeset	1426 goto parse_error;
54232 4501b638fc3f Refactor to remove duplicated nan/inf parsing code in Mark Dickinson <dickinsm@gmail.com> parents: 54001 diff changeset	1427 result_as_float = Py_BuildValue("(d)", negate ? -x : x);
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1428 if (result_as_float == NULL)
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1429 return NULL;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1430 result = PyObject_CallObject(cls, result_as_float);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1431 Py_DECREF(result_as_float);
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1432 return result;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1433
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1434 overflow_error:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1435 PyErr_SetString(PyExc_OverflowError,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1436 "hexadecimal value too large to represent as a float");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1437 return NULL;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1438
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1439 parse_error:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1440 PyErr_SetString(PyExc_ValueError,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1441 "invalid hexadecimal floating-point string");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1442 return NULL;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1443
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1444 insane_length_error:
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1445 PyErr_SetString(PyExc_ValueError,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1446 "hexadecimal string too long to convert");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1447 return NULL;
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1448 }
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1449
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1450 PyDoc_STRVAR(float_fromhex_doc,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1451 "float.fromhex(string) -> float\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1452 \n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1453 Create a floating-point number from a hexadecimal string.\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1454 >>> float.fromhex('0x1.ffffp10')\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1455 2047.984375\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1456 >>> float.fromhex('-0x1p-1074')\n\
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1457 -4.9406564584124654e-324");
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1458
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1459
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1460 static PyObject *
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1461 float_as_integer_ratio(PyObject v, PyObject unused)
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1462 {
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1463 double self;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1464 double float_part;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1465 int exponent;
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1466 int i;
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1467
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1468 PyObject *prev;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1469 PyObject *py_exponent = NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1470 PyObject *numerator = NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1471 PyObject *denominator = NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1472 PyObject *result_pair = NULL;
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1473 PyNumberMethods *long_methods = PyLong_Type.tp_as_number;
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1474
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1475 #define INPLACE_UPDATE(obj, call) \
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1476 prev = obj; \
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1477 obj = call; \
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1478 Py_DECREF(prev); \
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1479
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1480 CONVERT_TO_DOUBLE(v, self);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1481
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1482 if (Py_IS_INFINITY(self)) {
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1483 PyErr_SetString(PyExc_OverflowError,
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1484 "Cannot pass infinity to float.as_integer_ratio.");
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1485 return NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1486 }
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1487 #ifdef Py_NAN
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1488 if (Py_IS_NAN(self)) {
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1489 PyErr_SetString(PyExc_ValueError,
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 49270 diff changeset	1490 "Cannot pass NaN to float.as_integer_ratio.");
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1491 return NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1492 }
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1493 #endif
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1494
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1495 PyFPE_START_PROTECT("as_integer_ratio", goto error);
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1496 float_part = frexp(self, &exponent); /* self == float_part * 2*exponent exactly /
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1497 PyFPE_END_PROTECT(float_part);
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1498
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1499 for (i=0; i<300 && float_part != floor(float_part) ; i++) {
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1500 float_part *= 2.0;
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1501 exponent--;
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1502 }
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1503 /* self == float_part * 2**exponent exactly and float_part is integral.
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1504 If FLT_RADIX != 2, the 300 steps may leave a tiny fractional part
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1505 to be truncated by PyLong_FromDouble(). */
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1506
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1507 numerator = PyLong_FromDouble(float_part);
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1508 if (numerator == NULL) goto error;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1509
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1510 /* fold in 2*exponent /
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1511 denominator = PyLong_FromLong(1);
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1512 py_exponent = PyLong_FromLong(labs((long)exponent));
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1513 if (py_exponent == NULL) goto error;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1514 INPLACE_UPDATE(py_exponent,
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1515 long_methods->nb_lshift(denominator, py_exponent));
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1516 if (py_exponent == NULL) goto error;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1517 if (exponent > 0) {
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1518 INPLACE_UPDATE(numerator,
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1519 long_methods->nb_multiply(numerator, py_exponent));
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1520 if (numerator == NULL) goto error;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1521 }
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1522 else {
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1523 Py_DECREF(denominator);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1524 denominator = py_exponent;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1525 py_exponent = NULL;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1526 }
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1527
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1528 result_pair = PyTuple_Pack(2, numerator, denominator);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1529
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1530 #undef INPLACE_UPDATE
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1531 error:
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1532 Py_XDECREF(py_exponent);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1533 Py_XDECREF(denominator);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1534 Py_XDECREF(numerator);
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1535 return result_pair;
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1536 }
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1537
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1538 PyDoc_STRVAR(float_as_integer_ratio_doc,
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1539 "float.as_integer_ratio() -> (int, int)\n"
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1540 "\n"
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1541 "Returns a pair of integers, whose ratio is exactly equal to the original\n"
bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1542 "float and with a positive denominator.\n"
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 49270 diff changeset	1543 "Raises OverflowError on infinities and a ValueError on NaNs.\n"
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1544 "\n"
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1545 ">>> (10.0).as_integer_ratio()\n"
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1546 "(10, 1)\n"
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1547 ">>> (0.0).as_integer_ratio()\n"
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1548 "(0, 1)\n"
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1549 ">>> (-.25).as_integer_ratio()\n"
45134 bdcf40d1b38e Merged revisions 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	1550 "(-1, 4)");
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1551
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1552
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	1553 static PyObject *
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1554 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	1555
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1556 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1557 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	1558 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1559 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	1560 static char *kwlist[] = {"x", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1561
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1562 if (type != &PyFloat_Type)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1563 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	1564 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	1565 return NULL;
53160 4419e06219ca Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	1566 /* If it's a string, but not a string subclass, use
4419e06219ca Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	1567 PyFloat_FromString. */
4419e06219ca Merged revisions 71627 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51270 diff changeset	1568 if (PyUnicode_CheckExact(x))
41229 1f843890a4e6 Remove the deprecated and useless "pend" argument from Georg Brandl <georg@python.org> parents: 40626 diff changeset	1569 return PyFloat_FromString(x);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1570 return PyNumber_Float(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1571 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1572
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1573 /* 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	1574 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	1575 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	1576 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	1577 */
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1578 static PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1579 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	1580 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1581 PyObject tmp, newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1582
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1583 assert(PyType_IsSubtype(type, &PyFloat_Type));
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1584 tmp = float_new(&PyFloat_Type, args, kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1585 if (tmp == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1586 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	1587 assert(PyFloat_CheckExact(tmp));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1588 newobj = type->tp_alloc(type, 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1589 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	1590 Py_DECREF(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1591 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	1592 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1593 ((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	1594 Py_DECREF(tmp);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1595 return newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1596 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1597
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1598 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1599 float_getnewargs(PyFloatObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1600 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1601 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	1602 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1603
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1604 /* 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	1605
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1606 typedef enum {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1607 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	1608 } float_format_type;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1609
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1610 static float_format_type double_format, float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1611 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	1612
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1613 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1614 float_getformat(PyTypeObject v, PyObject arg)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1615 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1616 char* s;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1617 float_format_type r;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1618
42854 824b9d52e006 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42817 diff changeset	1619 if (!PyUnicode_Check(arg)) {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1620 PyErr_Format(PyExc_TypeError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1621 "__getformat__() argument must be string, not %.500s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	1622 Py_TYPE(arg)->tp_name);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1623 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1624 }
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48553 diff changeset	1625 s = _PyUnicode_AsString(arg);
42854 824b9d52e006 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42817 diff changeset	1626 if (s == NULL)
824b9d52e006 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42817 diff changeset	1627 return NULL;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1628 if (strcmp(s, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1629 r = double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1630 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1631 else if (strcmp(s, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1632 r = float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1633 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1634 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1635 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1636 "__getformat__() argument 1 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1637 "'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1638 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1639 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1640
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1641 switch (r) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1642 case unknown_format:
42126 8fc93215c0cc Change float.__getformat__() to return a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 41920 diff changeset	1643 return PyUnicode_FromString("unknown");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1644 case ieee_little_endian_format:
42126 8fc93215c0cc Change float.__getformat__() to return a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 41920 diff changeset	1645 return PyUnicode_FromString("IEEE, little-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1646 case ieee_big_endian_format:
42126 8fc93215c0cc Change float.__getformat__() to return a unicode string. Walter Dörwald <walter@livinglogic.de> parents: 41920 diff changeset	1647 return PyUnicode_FromString("IEEE, big-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1648 default:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1649 Py_FatalError("insane float_format or double_format");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1650 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1651 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1652 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1653
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1654 PyDoc_STRVAR(float_getformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1655 "float.__getformat__(typestr) -> string\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1656 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1657 "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	1658 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1659 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1660 "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	1661 "'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	1662 "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	1663
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1664 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1665 float_setformat(PyTypeObject v, PyObject args)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1666 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1667 char* typestr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1668 char* format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1669 float_format_type f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1670 float_format_type detected;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1671 float_format_type *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1672
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1673 if (!PyArg_ParseTuple(args, "ss:__setformat__", &typestr, &format))
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1674 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1675
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1676 if (strcmp(typestr, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1677 p = &double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1678 detected = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1679 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1680 else if (strcmp(typestr, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1681 p = &float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1682 detected = detected_float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1683 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1684 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1685 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1686 "__setformat__() argument 1 must "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1687 "be 'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1688 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1689 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1690
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1691 if (strcmp(format, "unknown") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1692 f = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1693 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1694 else if (strcmp(format, "IEEE, little-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1695 f = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1696 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1697 else if (strcmp(format, "IEEE, big-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1698 f = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1699 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1700 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1701 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1702 "__setformat__() argument 2 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1703 "'unknown', 'IEEE, little-endian' or "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1704 "'IEEE, big-endian'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1705 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1706
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1707 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1708
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1709 if (f != unknown_format && f != detected) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1710 PyErr_Format(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1711 "can only set %s format to 'unknown' or the "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1712 "detected platform value", typestr);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1713 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1714 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1715
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1716 *p = f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1717 Py_RETURN_NONE;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1718 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1719
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1720 PyDoc_STRVAR(float_setformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1721 "float.__setformat__(typestr, fmt) -> None\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1722 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1723 "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	1724 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1725 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1726 "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	1727 "'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	1728 "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	1729 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1730 "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	1731 "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	1732
42417 d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1733 static PyObject *
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1734 float_getzero(PyObject v, void closure)
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1735 {
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1736 return PyFloat_FromDouble(0.0);
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1737 }
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1738
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1739 static PyObject *
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1740 float__format__(PyObject self, PyObject args)
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1741 {
47393 0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1742 PyObject *format_spec;
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1743
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1744 if (!PyArg_ParseTuple(args, "U:__format__", &format_spec))
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1745 return NULL;
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1746 return _PyFloat_FormatAdvanced(self,
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1747 PyUnicode_AS_UNICODE(format_spec),
0da27fdf0192 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 46790 diff changeset	1748 PyUnicode_GET_SIZE(format_spec));
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1749 }
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1750
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1751 PyDoc_STRVAR(float__format__doc,
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1752 "float.__format__(format_spec) -> string\n"
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1753 "\n"
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1754 "Formats the float according to format_spec.");
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1755
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1756
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1757 static PyMethodDef float_methods[] = {
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1758 {"conjugate", (PyCFunction)float_float, METH_NOARGS,
42417 d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1759 "Returns self, the complex conjugate of any float."},
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1760 {"__trunc__", (PyCFunction)float_trunc, METH_NOARGS,
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1761 "Returns the Integral closest to x between 0 and x."},
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1762 {"__round__", (PyCFunction)float_round, METH_VARARGS,
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1763 "Returns the Integral closest to x, rounding half toward even.\n"
077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1764 "When an argument is passed, works like built-in round(x, ndigits)."},
45026 ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1765 {"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS,
ebfbaa1051e2 Merged revisions 60364-60378 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44943 diff changeset	1766 float_as_integer_ratio_doc},
48497 2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1767 {"fromhex", (PyCFunction)float_fromhex,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1768 METH_O\|METH_CLASS, float_fromhex_doc},
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1769 {"hex", (PyCFunction)float_hex,
2bb866d282ba Merged revisions 64974 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 48364 diff changeset	1770 METH_NOARGS, float_hex_doc},
46477 b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1771 {"is_integer", (PyCFunction)float_is_integer, METH_NOARGS,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1772 "Returns True if the float is an integer."},
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1773 #if 0
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1774 {"is_inf", (PyCFunction)float_is_inf, METH_NOARGS,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1775 "Returns True if the float is positive or negative infinite."},
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1776 {"is_finite", (PyCFunction)float_is_finite, METH_NOARGS,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1777 "Returns True if the float is finite, neither infinite nor NaN."},
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1778 {"is_nan", (PyCFunction)float_is_nan, METH_NOARGS,
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1779 "Returns True if the float is not a number (NaN)."},
b69f443ef480 Merged revisions 62380,62382-62383 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46161 diff changeset	1780 #endif
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1781 {"__getnewargs__", (PyCFunction)float_getnewargs, METH_NOARGS},
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1782 {"__getformat__", (PyCFunction)float_getformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1783 METH_O\|METH_CLASS, float_getformat_doc},
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1784 {"__setformat__", (PyCFunction)float_setformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1785 METH_VARARGS\|METH_CLASS, float_setformat_doc},
42817 5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1786 {"__format__", (PyCFunction)float__format__,
5355337709e1 Implementation of PEP 3101, Advanced String Formatting. Eric Smith <eric@trueblade.com> parents: 42753 diff changeset	1787 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	1788 {NULL, NULL} /* sentinel */
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1789 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1790
42417 d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1791 static PyGetSetDef float_getset[] = {
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1792 {"real",
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1793 (getter)float_float, (setter)NULL,
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1794 "the real part of a complex number",
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1795 NULL},
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1796 {"imag",
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1797 (getter)float_getzero, (setter)NULL,
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1798 "the imaginary part of a complex number",
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1799 NULL},
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1800 {NULL} /* Sentinel */
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1801 };
d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1802
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	1803 PyDoc_STRVAR(float_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1804 "float(x) -> floating point number\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1805 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	1806 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	1807
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1808
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1809 static PyNumberMethods float_as_number = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1810 float_add, /nb_add/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1811 float_sub, /nb_subtract/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1812 float_mul, /nb_multiply/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1813 float_rem, /nb_remainder/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1814 float_divmod, /nb_divmod/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1815 float_pow, /nb_power/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	1816 (unaryfunc)float_neg, /nb_negative/
42417 d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1817 (unaryfunc)float_float, /nb_positive/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	1818 (unaryfunc)float_abs, /nb_absolute/
40401 88133417dfd0 - patch #1600346 submitted by Tomer Filiba Jack Diederich <jackdied@gmail.com> parents: 39603 diff changeset	1819 (inquiry)float_bool, /nb_bool/
405 d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1820 0, /nb_invert/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1821 0, /nb_lshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1822 0, /nb_rshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1823 0, /nb_and/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1824 0, /nb_xor/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1825 0, /nb_or/
42753 077fe7860cc9 Finish the work on __round__ and __trunc__. Guido van Rossum <guido@python.org> parents: 42559 diff changeset	1826 float_trunc, /nb_int/
50821 df3fa40fdbed Issue #4910, patch 3/3: rename nb_long to nb_reserved Mark Dickinson <dickinsm@gmail.com> parents: 50804 diff changeset	1827 0, /nb_reserved/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1828 float_float, /nb_float/
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1829 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1830 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1831 0, /* nb_inplace_multiply */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1832 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1833 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1834 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1835 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1836 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1837 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1838 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	1839 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	1840 float_div, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1841 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1842 0, /* nb_inplace_true_divide */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1843 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1844
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1845 PyTypeObject PyFloat_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42126 diff changeset	1846 PyVarObject_HEAD_INIT(&PyType_Type, 0)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1847 "float",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1848 sizeof(PyFloatObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1849 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1850 (destructor)float_dealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42417 diff changeset	1851 0, /* tp_print */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1852 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1853 0, /* tp_setattr */
51270 debd14c489b9 Issue #1717: rename tp_compare to tp_reserved. I'll change the Mark Dickinson <dickinsm@gmail.com> parents: 50823 diff changeset	1854 0, /* tp_reserved */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1855 (reprfunc)float_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1856 &float_as_number, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1857 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1858 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1859 (hashfunc)float_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1860 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1861 (reprfunc)float_str, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1862 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1863 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1864 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	1865 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1866 float_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1867 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1868 0, /* tp_clear */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	1869 float_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1870 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1871 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1872 0, /* tp_iternext */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1873 float_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1874 0, /* tp_members */
42417 d3a5c796c8ba Changes to long and float by Jeffrey Jasskin to conform to PEP 3141. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1875 float_getset, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1876 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1877 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1878 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1879 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1880 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1881 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1882 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1883 float_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1884 };
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1885
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1886 void
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1887 _PyFloat_Init(void)
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 /* 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	1890 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	1891 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	1892 IEEE platform, the float packing/unpacking routines can
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1893 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	1894 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	1895 values, but what happens to infinities, NaNs and signed
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1896 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	1897 a NaN or an infinity will raise an exception.
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1898
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1899 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	1900 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	1901 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	1902 method. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1903
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1904 #if SIZEOF_DOUBLE == 8
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 double x = 9006104071832581.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1907 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	1908 detected_double_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1909 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	1910 detected_double_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1911 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1912 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1913 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1914 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1915 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1916 #endif
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1917
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1918 #if SIZEOF_FLOAT == 4
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1919 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1920 float y = 16711938.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1921 if (memcmp(&y, "\x4b\x7f\x01\x02", 4) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1922 detected_float_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1923 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	1924 detected_float_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1925 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1926 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1927 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1928 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1929 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1930 #endif
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 double_format = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1933 float_format = detected_float_format;
44268 7ae604b3533b Merged revisions 59450-59464 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44260 diff changeset	1934
45071 f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	1935 /* Init float info */
f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	1936 if (FloatInfoType.tp_name == 0)
f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45026 diff changeset	1937 PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1938 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1939
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1940 int
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1941 PyFloat_ClearFreeList(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1942 {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1943 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	1944 PyFloatBlock list, next;
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1945 int i;
48734 89538d5fb81a fix cut and paste error in a comment Gregory P. Smith <greg@mad-scientist.com> parents: 48660 diff changeset	1946 int u; /* remaining unfreed floats per block */
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1947 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	1948
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1949 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	1950 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	1951 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	1952 while (list != NULL) {
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1953 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	1954 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	1955 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	1956 i++, p++) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	1957 if (PyFloat_CheckExact(p) && Py_REFCNT(p) != 0)
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1958 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	1959 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1960 next = list->next;
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1961 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	1962 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	1963 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	1964 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	1965 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	1966 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	1967 if (!PyFloat_CheckExact(p) \|\|
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	1968 Py_REFCNT(p) == 0) {
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	1969 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	1970 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	1971 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	1972 }
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	1973 }
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	1974 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1975 else {
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1976 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	1977 }
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1978 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	1979 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	1980 }
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1981 return freelist_size;
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1982 }
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1983
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1984 void
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1985 PyFloat_Fini(void)
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1986 {
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1987 PyFloatObject *p;
3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1988 PyFloatBlock *list;
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1989 int i;
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1990 int u; /* total unfreed floats per block */
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1991
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1992 u = PyFloat_ClearFreeList();
45145 3d7b84daa34a Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552-60567 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45134 diff changeset	1993
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1994 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	1995 return;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1996 fprintf(stderr, "# cleanup floats");
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	1997 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	1998 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	1999 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2000 else {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2001 fprintf(stderr,
48499 de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	2002 ": %d unfreed float%s\n",
de0bf60f1245 Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from Georg Brandl <georg@python.org> parents: 48497 diff changeset	2003 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	2004 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2005 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	2006 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	2007 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	2008 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	2009 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	2010 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	2011 if (PyFloat_CheckExact(p) &&
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2012 Py_REFCNT(p) != 0) {
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2013 char *buf = PyOS_double_to_string(
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2014 PyFloat_AS_DOUBLE(p), 'r',
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2015 0, 0, NULL);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2016 if (buf) {
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2017 /* XXX(twouters) cast
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2018 refcount to long
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2019 until %zd is
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2020 universally
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2021 available
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2022 */
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2023 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	2024 "# <float at %p, refcnt=%ld, val=%s>\n",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44349 diff changeset	2025 p, (long)Py_REFCNT(p), buf);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2026 PyMem_Free(buf);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 53160 diff changeset	2027 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2028 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2029 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	2030 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	2031 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	2032 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	2033 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2034
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2035 /*----------------------------------------------------------------------------
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2036 * _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	2037 */
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2038 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2039 _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	2040 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2041 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2042 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2043 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2044 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2045 unsigned int fbits;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2046 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2047
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2048 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2049 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2050 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2051 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2052
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2053 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2054 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2055 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2056 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2057 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2058 sign = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2059
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2060 f = frexp(x, &e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2061
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2062 /* 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	2063 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2064 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2065 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2066 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2067 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2068 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2069 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2070 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2071 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2072 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2073 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2074
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2075 if (e >= 128)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2076 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2077 else if (e < -126) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2078 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2079 f = ldexp(f, 126 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2080 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2081 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2082 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2083 e += 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2084 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2085 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2086
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2087 f = 8388608.0; / 2*23 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2088 fbits = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2089 assert(fbits <= 8388608);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2090 if (fbits >> 23) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2091 /* 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	2092 fbits = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2093 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2094 if (e >= 255)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2095 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2096 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2097
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2098 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2099 *p = (sign << 7) \| (e >> 1);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2100 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2101
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2102 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2103 *p = (char) (((e & 1) << 7) \| (fbits >> 16));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2104 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2105
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2106 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2107 *p = (fbits >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2108 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2109
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2110 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2111 *p = fbits & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2112
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2113 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2114 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2115
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2116 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2117 else {
35178 cf7a849ce61f Apparently some compiler gives a warning on Michael W. Hudson <mwh@python.net> parents: 34972 diff changeset	2118 float y = (float)x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2119 const char s = (char)&y;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2120 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	2121
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2122 if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2123 goto Overflow;
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2124
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2125 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2126 \|\| (float_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2127 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2128 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2129 }
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2130
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2131 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2132 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2133 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2134 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2135 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	2136 }
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2137 Overflow:
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2138 PyErr_SetString(PyExc_OverflowError,
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2139 "float too large to pack with f format");
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45145 diff changeset	2140 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	2141 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2142
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2143 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2144 _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	2145 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2146 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2147 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2148 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2149 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2150 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2151 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2152
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2153 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2154 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2155 incr = -1;
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
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2158 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2159 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2160 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2161 }
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 sign = 0;
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 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	2166
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2167 /* 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	2168 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2169 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2170 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2171 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2172 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2173 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2174 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2175 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2176 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2177 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2178 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2179
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2180 if (e >= 1024)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2181 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2182 else if (e < -1022) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2183 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2184 f = ldexp(f, 1022 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2185 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2186 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2187 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2188 e += 1023;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2189 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2190 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2191
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2192 /* 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	2193 f = 268435456.0; / 2*28 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2194 fhi = (unsigned int)f; /* Truncate */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2195 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	2196
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2197 f -= (double)fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2198 f = 16777216.0; / 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2199 flo = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2200 assert(flo <= 16777216);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2201 if (flo >> 24) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2202 /* 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	2203 flo = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2204 ++fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2205 if (fhi >> 28) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2206 /* 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	2207 fhi = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2208 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2209 if (e >= 2047)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2210 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2211 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2212 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2213
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2214 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2215 *p = (sign << 7) \| (e >> 4);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2216 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2217
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2218 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2219 *p = (unsigned char) (((e & 0xF) << 4) \| (fhi >> 24));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2220 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	2221
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2222 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2223 *p = (fhi >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2224 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2225
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2226 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2227 *p = (fhi >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2228 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2229
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2230 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2231 *p = fhi & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2232 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2233
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2234 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2235 *p = (flo >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2236 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2237
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2238 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2239 *p = (flo >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2240 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2241
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2242 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2243 *p = flo & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2244 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2245
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2246 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2247 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2248
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2249 Overflow:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2250 PyErr_SetString(PyExc_OverflowError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2251 "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	2252 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	2253 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2254 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2255 const char s = (char)&x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2256 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	2257
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2258 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2259 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2260 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2261 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2262 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2263
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2264 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2265 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2266 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2267 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2268 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2269 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2270 }
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 double
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_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	2274 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2275 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2276 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2277 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2278 unsigned int f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2279 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2280 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2281
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2282 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2283 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2284 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2285 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2286
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2287 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2288 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2289 e = (*p & 0x7F) << 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2290 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	2291
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2292 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2293 e \|= (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2294 f = (*p & 0x7F) << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2295 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	2296
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2297 if (e == 255) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2298 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2299 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2300 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2301 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2302 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2303 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2304
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2305 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2306 f \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2307 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	2308
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2309 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2310 f \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2311
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2312 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	2313
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2314 /* XXX This sadly ignores Inf/NaN issues */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2315 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2316 e = -126;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2317 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2318 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2319 e -= 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2320 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2321 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	2322
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2323 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2324 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	2325
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2326 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	2327 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2328 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2329 float x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2330
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2331 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2332 \|\| (float_format == ieee_big_endian_format && le)) {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2333 char buf[4];
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2334 char *d = &buf[3];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2335 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	2336
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2337 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2338 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2339 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2340 memcpy(&x, buf, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2341 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2342 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2343 memcpy(&x, p, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2344 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2345
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2346 return x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2347 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2348 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2349
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2350 double
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2351 _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	2352 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2353 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2354 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2355 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2356 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2357 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2358 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	2359
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2360 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2361 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2362 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2363 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2364
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2365 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2366 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2367 e = (*p & 0x7F) << 4;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2368
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2369 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	2370
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2371 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2372 e \|= (*p >> 4) & 0xF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2373 fhi = (*p & 0xF) << 24;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2374 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	2375
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2376 if (e == 2047) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2377 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2378 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2379 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2380 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2381 return -1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2382 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2383
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2384 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2385 fhi \|= *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2386 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	2387
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2388 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2389 fhi \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2390 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2391
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2392 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2393 fhi \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2394 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	2395
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2396 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2397 flo = *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2398 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2399
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2400 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2401 flo \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2402 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2403
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2404 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2405 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	2406
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2407 x = (double)fhi + (double)flo / 16777216.0; /* 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2408 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	2409
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2410 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2411 e = -1022;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2412 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2413 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2414 e -= 1023;
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 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	2417
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2418 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2419 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	2420
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2421 return x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2422 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2423 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2424 double x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2425
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2426 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2427 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2428 char buf[8];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2429 char *d = &buf[7];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2430 int i;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2431
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2432 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2433 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2434 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2435 memcpy(&x, buf, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2436 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2437 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2438 memcpy(&x, p, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2439 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2440
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2441 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	2442 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2443 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/floatobject.c @ 60174:255a401c19b0