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

annotate Objects/floatobject.c @ 64158:ea0decd2acfb

Fix typo

author	Éric Araujo <merwok@netwok.org>
date	Wed, 18 Aug 2010 22:35:23 +0000
parents	eafe07d40eb7
children	e8969fb822fc

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/floatobject.c @ 64158:ea0decd2acfb