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

annotate Objects/floatobject.c @ 72751:d760b345d7bd

Fix compilation warnings under 64-bit Windows

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 06 Oct 2011 15:44:15 +0200
parents	8beaa9a37387
children	d76338eacf7c

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/floatobject.c @ 72751:d760b345d7bd