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

annotate Objects/floatobject.c @ 47787:b32101c19bf8 legacy-trunk

Grammar fixes

author	Andrew M. Kuchling <amk@amk.ca>
date	Fri, 20 Jun 2008 23:14:32 +0000
parents	52294af4b663
children	4267adacdd52

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 91 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Float object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	4 /* XXX There should be overflow checks here, but it's hard to check
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	5 for any kind of float exception without losing portability. */
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	6
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	7 #include "Python.h"
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	8 #include "structseq.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 60 diff changeset	10 #include <ctype.h>
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	11 #include <float.h>
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12
46154 1e10b30f7498 Fix compiler warning about finite() missing on Solaris. Neal Norwitz <nnorwitz@gmail.com> parents: 46135 diff changeset	13 #ifdef HAVE_IEEEFP_H
1e10b30f7498 Fix compiler warning about finite() missing on Solaris. Neal Norwitz <nnorwitz@gmail.com> parents: 46135 diff changeset	14 #include <ieeefp.h>
1e10b30f7498 Fix compiler warning about finite() missing on Solaris. Neal Norwitz <nnorwitz@gmail.com> parents: 46135 diff changeset	15 #endif
1e10b30f7498 Fix compiler warning about finite() missing on Solaris. Neal Norwitz <nnorwitz@gmail.com> parents: 46135 diff changeset	16
44940 12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	17 #ifdef _OSF_SOURCE
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	18 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	19 extern int finite(double);
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	20 #endif
12099143724f Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) Neal Norwitz <nnorwitz@gmail.com> parents: 44670 diff changeset	21
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	22 /* Special free list -- see comments for same code in intobject.c. */
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	23 #define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	24 #define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	25 #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	26
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	27 struct _floatblock {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	28 struct _floatblock *next;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	29 PyFloatObject objects[N_FLOATOBJECTS];
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	30 };
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	31
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	32 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	33
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	34 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	35 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	36
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	37 static PyFloatObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	38 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	39 {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	40 PyFloatObject p, q;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	41 /* XXX Float blocks escape the object heap. Use PyObject_MALLOC ??? */
1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	42 p = (PyFloatObject *) PyMem_MALLOC(sizeof(PyFloatBlock));
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	43 if (p == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	44 return (PyFloatObject *) PyErr_NoMemory();
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	45 ((PyFloatBlock *)p)->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	46 block_list = (PyFloatBlock *)p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	47 p = &((PyFloatBlock *)p)->objects[0];
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	48 q = p + N_FLOATOBJECTS;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	49 while (--q > p)
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	50 Py_TYPE(q) = (struct _typeobject *)(q-1);
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	51 Py_TYPE(q) = NULL;
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	52 return p + N_FLOATOBJECTS - 1;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	53 }
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	54
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	55 double
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	56 PyFloat_GetMax(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	57 {
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	58 return DBL_MAX;
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	59 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	60
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	61 double
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	62 PyFloat_GetMin(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	63 {
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	64 return DBL_MIN;
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	65 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	66
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	67 static PyTypeObject FloatInfoType = {0, 0, 0, 0, 0, 0};
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	68
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	69 PyDoc_STRVAR(floatinfo__doc__,
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	70 "sys.floatinfo\n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	71 \n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	72 A structseq holding information about the float type. It contains low level\n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	73 information about the precision and internal representation. Please study\n\
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	74 your system's :file:`float.h` for more information.");
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	75
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	76 static PyStructSequence_Field floatinfo_fields[] = {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	77 {"max", "DBL_MAX -- maximum representable finite float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	78 {"max_exp", "DBL_MAX_EXP -- maximum int e such that radix**(e-1) "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	79 "is representable"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	80 {"max_10_exp", "DBL_MAX_10_EXP -- maximum int e such that 10**e "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	81 "is representable"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	82 {"min", "DBL_MIN -- Minimum positive normalizer float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	83 {"min_exp", "DBL_MIN_EXP -- minimum int e such that radix**(e-1) "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	84 "is a normalized float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	85 {"min_10_exp", "DBL_MIN_10_EXP -- minimum int e such that 10**e is "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	86 "a normalized"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	87 {"dig", "DBL_DIG -- digits"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	88 {"mant_dig", "DBL_MANT_DIG -- mantissa digits"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	89 {"epsilon", "DBL_EPSILON -- Difference between 1 and the next "
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	90 "representable float"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	91 {"radix", "FLT_RADIX -- radix of exponent"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	92 {"rounds", "FLT_ROUNDS -- addition rounds"},
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	93 {0}
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	94 };
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	95
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	96 static PyStructSequence_Desc floatinfo_desc = {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	97 "sys.floatinfo", /* name */
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	98 floatinfo__doc__, /* doc */
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	99 floatinfo_fields, /* fields */
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	100 11
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	101 };
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	102
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	103 PyObject *
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	104 PyFloat_GetInfo(void)
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	105 {
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	106 PyObject* floatinfo;
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	107 int pos = 0;
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	108
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	109 floatinfo = PyStructSequence_New(&FloatInfoType);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	110 if (floatinfo == NULL) {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	111 return NULL;
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	112 }
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	113
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	114 #define SetIntFlag(flag) \
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	115 PyStructSequence_SET_ITEM(floatinfo, pos++, PyInt_FromLong(flag))
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	116 #define SetDblFlag(flag) \
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	117 PyStructSequence_SET_ITEM(floatinfo, pos++, PyFloat_FromDouble(flag))
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	118
44670 d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	119 SetDblFlag(DBL_MAX);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	120 SetIntFlag(DBL_MAX_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	121 SetIntFlag(DBL_MAX_10_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	122 SetDblFlag(DBL_MIN);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	123 SetIntFlag(DBL_MIN_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	124 SetIntFlag(DBL_MIN_10_EXP);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	125 SetIntFlag(DBL_DIG);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	126 SetIntFlag(DBL_MANT_DIG);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	127 SetDblFlag(DBL_EPSILON);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	128 SetIntFlag(FLT_RADIX);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	129 SetIntFlag(FLT_ROUNDS);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	130 #undef SetIntFlag
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	131 #undef SetDblFlag
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	132
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	133 if (PyErr_Occurred()) {
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	134 Py_CLEAR(floatinfo);
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	135 return NULL;
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	136 }
d66e5837aa57 Now that I've learnt about structseq objects I felt like converting sys.float_info to a structseq. It's Christian Heimes <christian@cheimes.de> parents: 44488 diff changeset	137 return floatinfo;
44085 c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	138 }
c218d1ac916e Feature #1534 Christian Heimes <christian@cheimes.de> parents: 43378 diff changeset	139
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	140 PyObject *
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	141 PyFloat_FromDouble(double fval)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	142 {
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	143 register PyFloatObject *op;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	144 if (free_list == NULL) {
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	145 if ((free_list = fill_free_list()) == NULL)
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	146 return NULL;
c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	147 }
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24280 diff changeset	148 /* Inline PyObject_New */
5504 c88b9b868995 Faster floating point allocator, same idea as the int allocator. Guido van Rossum <guido@python.org> parents: 5396 diff changeset	149 op = free_list;
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	150 free_list = (PyFloatObject *)Py_TYPE(op);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	151 PyObject_INIT(op, &PyFloat_Type);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	152 op->ob_fval = fval;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	153 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	154 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	155
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	156 /**************************************************************************
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	157 RED_FLAG 22-Sep-2000 tim
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	158 PyFloat_FromString's pend argument is braindead. Prior to this RED_FLAG,
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	159
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	160 1. If v was a regular string, *pend was set to point to its terminating
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	161 null byte. That's useless (the caller can find that without any
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	162 help from this function!).
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	163
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	164 2. If v was a Unicode string, or an object convertible to a character
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	165 buffer, *pend was set to point into stack trash (the auto temp
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	166 vector holding the character buffer). That was downright dangerous.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	167
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	168 Since we can't change the interface of a public API function, pend is
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	169 still supported but now officially useless: if pend is not NULL,
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	170 *pend is set to NULL.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	171 **************************************************************************/
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	172 PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	173 PyFloat_FromString(PyObject v, char *pend)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	174 {
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	175 const char s, last, end, sp;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	176 double x;
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	177 char buffer[256]; /* for errors */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	178 #ifdef Py_USING_UNICODE
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	179 char s_buffer[256]; /* for objects convertible to a char buffer */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	180 #endif
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	181 Py_ssize_t len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	182
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	183 if (pend)
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	184 *pend = NULL;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	185 if (PyString_Check(v)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	186 s = PyString_AS_STRING(v);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	187 len = PyString_GET_SIZE(v);
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	188 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	189 #ifdef Py_USING_UNICODE
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	190 else if (PyUnicode_Check(v)) {
37815 20cb13bdf1f0 C++ compiler cleanup: bunch-o-casts, plus use of unsigned loop index var in a couple places Skip Montanaro <skip@pobox.com> parents: 37589 diff changeset	191 if (PyUnicode_GET_SIZE(v) >= (Py_ssize_t)sizeof(s_buffer)) {
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	192 PyErr_SetString(PyExc_ValueError,
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	193 "Unicode float() literal too long to convert");
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	194 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	195 }
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	196 if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	197 PyUnicode_GET_SIZE(v),
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	198 s_buffer,
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	199 NULL))
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	200 return NULL;
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	201 s = s_buffer;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36235 diff changeset	202 len = strlen(s);
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 11969 diff changeset	203 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19051 diff changeset	204 #endif
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	205 else if (PyObject_AsCharBuffer(v, &s, &len)) {
74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	206 PyErr_SetString(PyExc_TypeError,
23344 bffc7236c4ba clarify message when raising TypeError to indicate that float() accepts Skip Montanaro <skip@pobox.com> parents: 22228 diff changeset	207 "float() argument must be a string or a number");
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	208 return NULL;
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	209 }
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	210
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	211 last = s + len;
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	212 while (s && isspace(Py_CHARMASK(s)))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	213 s++;
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	214 if (*s == '\0') {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	215 PyErr_SetString(PyExc_ValueError, "empty string for float()");
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	216 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	217 }
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	218 sp = s;
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	219 /* We don't care about overflow or underflow. If the platform supports
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	220 * them, infinities and signed zeroes (on underflow) are fine.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	221 * However, strtod can return 0 for denormalized numbers, where atof
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	222 * does not. So (alas!) we special-case a zero result. Note that
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	223 * whether strtod sets errno on underflow is not defined, so we can't
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	224 * key off errno.
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	225 */
14851 5449302c4d2e Replace SIGFPE paranoia around strtod and atof. I don't believe these Tim Peters <tim.peters@gmail.com> parents: 14783 diff changeset	226 PyFPE_START_PROTECT("strtod", return NULL)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32150 diff changeset	227 x = PyOS_ascii_strtod(s, (char **)&end);
14851 5449302c4d2e Replace SIGFPE paranoia around strtod and atof. I don't believe these Tim Peters <tim.peters@gmail.com> parents: 14783 diff changeset	228 PyFPE_END_PROTECT(x)
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	229 errno = 0;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	230 /* Believe it or not, Solaris 2.6 can move end beyond the null
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	231 byte at the end of the string, when the input is inf(inity). */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	232 if (end > last)
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	233 end = last;
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	234 /* Check for inf and nan. This is done late because it rarely happens. */
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	235 if (end == s) {
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	236 char p = (char)sp;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	237 int sign = 1;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	238
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	239 if (*p == '-') {
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	240 sign = -1;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	241 p++;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	242 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	243 if (*p == '+') {
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	244 p++;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	245 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	246 if (PyOS_strnicmp(p, "inf", 4) == 0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	247 Py_RETURN_INF(sign);
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	248 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	249 #ifdef Py_NAN
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	250 if(PyOS_strnicmp(p, "nan", 4) == 0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	251 Py_RETURN_NAN;
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	252 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	253 #endif
21079 8cef75cacb01 PyFloat_FromString(): Conversion of sprintf() to PyOS_snprintf() for Barry Warsaw <barry@python.org> parents: 20829 diff changeset	254 PyOS_snprintf(buffer, sizeof(buffer),
8cef75cacb01 PyFloat_FromString(): Conversion of sprintf() to PyOS_snprintf() for Barry Warsaw <barry@python.org> parents: 20829 diff changeset	255 "invalid literal for float(): %.200s", s);
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	256 PyErr_SetString(PyExc_ValueError, buffer);
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	257 return NULL;
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	258 }
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	259 /* Since end != s, the platform made some kind of sense out
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	260 of the input. Trust it. */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	261 while (end && isspace(Py_CHARMASK(end)))
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	262 end++;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	263 if (*end != '\0') {
21079 8cef75cacb01 PyFloat_FromString(): Conversion of sprintf() to PyOS_snprintf() for Barry Warsaw <barry@python.org> parents: 20829 diff changeset	264 PyOS_snprintf(buffer, sizeof(buffer),
8cef75cacb01 PyFloat_FromString(): Conversion of sprintf() to PyOS_snprintf() for Barry Warsaw <barry@python.org> parents: 20829 diff changeset	265 "invalid literal for float(): %.200s", s);
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	266 PyErr_SetString(PyExc_ValueError, buffer);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	267 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	268 }
11969 74b7213fb609 Many changes for Unicode, by Marc-Andre Lemburg. Guido van Rossum <guido@python.org> parents: 11673 diff changeset	269 else if (end != last) {
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	270 PyErr_SetString(PyExc_ValueError,
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	271 "null byte in argument for float()");
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	272 return NULL;
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	273 }
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	274 if (x == 0.0) {
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	275 /* See above -- may have been strtod being anal
77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	276 about denorms. */
14851 5449302c4d2e Replace SIGFPE paranoia around strtod and atof. I don't believe these Tim Peters <tim.peters@gmail.com> parents: 14783 diff changeset	277 PyFPE_START_PROTECT("atof", return NULL)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32150 diff changeset	278 x = PyOS_ascii_atof(s);
14851 5449302c4d2e Replace SIGFPE paranoia around strtod and atof. I don't believe these Tim Peters <tim.peters@gmail.com> parents: 14783 diff changeset	279 PyFPE_END_PROTECT(x)
14783 77eddddbb7cc Fix for SF bug 110624: float literals behave inconsistently. Tim Peters <tim.peters@gmail.com> parents: 14616 diff changeset	280 errno = 0; /* whether atof ever set errno is undefined */
11383 aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	281 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	282 return PyFloat_FromDouble(x);
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	283 }
aca7b5eaf5e8 Mainlining the string_methods branch. See branch revision log Barry Warsaw <barry@python.org> parents: 10833 diff changeset	284
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	285 static void
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	286 float_dealloc(PyFloatObject *op)
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	287 {
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	288 if (PyFloat_CheckExact(op)) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	289 Py_TYPE(op) = (struct _typeobject *)free_list;
20277 2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	290 free_list = op;
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	291 }
2983b54256c7 Enable GC for new-style instances. This touches lots of files, since Guido van Rossum <guido@python.org> parents: 19976 diff changeset	292 else
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	293 Py_TYPE(op)->tp_free((PyObject *)op);
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	294 }
c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	295
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	296 double
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	297 PyFloat_AsDouble(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	299 PyNumberMethods *nb;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	300 PyFloatObject *fo;
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	301 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	302
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	303 if (op && PyFloat_Check(op))
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	304 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	305
26272 fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	306 if (op == NULL) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	307 PyErr_BadArgument();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	310
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	311 if ((nb = Py_TYPE(op)->tp_as_number) == NULL \|\| nb->nb_float == NULL) {
26272 fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	312 PyErr_SetString(PyExc_TypeError, "a float is required");
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	313 return -1;
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	314 }
fbccef8b3153 Improve exception message raised by PyFloat_AsDouble if the object does not Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 24898 diff changeset	315
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	316 fo = (PyFloatObject) (nb->nb_float) (op);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	317 if (fo == NULL)
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	318 return -1;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	319 if (!PyFloat_Check(fo)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	320 PyErr_SetString(PyExc_TypeError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	321 "nb_float should return float object");
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	322 return -1;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	323 }
20823 c7aa332a2ffa SF bug #477221: abs and divmod act oddly with -0.0. Tim Peters <tim.peters@gmail.com> parents: 20654 diff changeset	324
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	325 val = PyFloat_AS_DOUBLE(fo);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	326 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	327
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	328 return val;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	329 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	330
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	331 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	332
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	333 static void
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	334 format_float(char buf, size_t buflen, PyFloatObject v, int precision)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	335 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	336 register char *cp;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32150 diff changeset	337 char format[32];
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	338 int i;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	339
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	340 /* Subroutine for float_repr and float_print.
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	341 We want float numbers to be recognizable as such,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	342 i.e., they should contain a decimal point or an exponent.
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	343 However, %g may print the number as an integer;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	344 in such cases, we append ".0" to the string. */
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	345
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	346 assert(PyFloat_Check(v));
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32150 diff changeset	347 PyOS_snprintf(format, 32, "%%.%ig", precision);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 32150 diff changeset	348 PyOS_ascii_formatd(buf, buflen, format, v->ob_fval);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	349 cp = buf;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	350 if (*cp == '-')
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	351 cp++;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	352 for (; *cp != '\0'; cp++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	353 /* Any non-digit means it's not an integer;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	354 this takes care of NAN and INF as well. */
2308 14b126d0b5be use Py_CHARMASK; and don't check for neg. float to the float power here Guido van Rossum <guido@python.org> parents: 2156 diff changeset	355 if (!isdigit(Py_CHARMASK(*cp)))
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	356 break;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	357 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	358 if (*cp == '\0') {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	359 *cp++ = '.';
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	360 *cp++ = '0';
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	361 *cp++ = '\0';
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	362 return;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363 }
44344 1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	364 /* Checking the next three chars should be more than enough to
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	365 * detect inf or nan, even on Windows. We check for inf or nan
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	366 * at last because they are rare cases.
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	367 */
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	368 for (i=0; *cp != '\0' && i<3; cp++, i++) {
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	369 if (isdigit(Py_CHARMASK(cp)) \|\| cp == '.')
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	370 continue;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	371 /* found something that is neither a digit nor point
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	372 * it might be a NaN or INF
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	373 */
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	374 #ifdef Py_NAN
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	375 if (Py_IS_NAN(v->ob_fval)) {
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	376 strcpy(buf, "nan");
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	377 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	378 else
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	379 #endif
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	380 if (Py_IS_INFINITY(v->ob_fval)) {
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	381 cp = buf;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	382 if (*cp == '-')
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	383 cp++;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	384 strcpy(cp, "inf");
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	385 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	386 break;
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	387 }
1d69aabf6f7f Applied patch #1635: Float patch for inf and nan on Windows (and other platforms). Christian Heimes <christian@cheimes.de> parents: 44267 diff changeset	388
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	390
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	391 /* XXX PyFloat_AsStringEx should not be a public API function (for one
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	392 XXX thing, its signature passes a buffer without a length; for another,
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	393 XXX it isn't useful outside this file).
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	394 */
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	395 void
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	396 PyFloat_AsStringEx(char buf, PyFloatObject v, int precision)
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	397 {
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	398 format_float(buf, 100, v, precision);
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	399 }
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	400
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	401 /* Macro and helper that convert PyObject obj to a C double and store
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	402 the value in dbl; this replaces the functionality of the coercion
21354 fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	403 slot function. If conversion to double raises an exception, obj is
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	404 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	405 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	406 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	407 */
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	408 #define CONVERT_TO_DOUBLE(obj, dbl) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	409 if (PyFloat_Check(obj)) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	410 dbl = PyFloat_AS_DOUBLE(obj); \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	411 else if (convert_to_double(&(obj), &(dbl)) < 0) \
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	412 return obj;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	413
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	414 static int
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	415 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	416 {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	417 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	418
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	419 if (PyInt_Check(obj)) {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	420 *dbl = (double)PyInt_AS_LONG(obj);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	421 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	422 else if (PyLong_Check(obj)) {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	423 *dbl = PyLong_AsDouble(obj);
19674 715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	424 if (*dbl == -1.0 && PyErr_Occurred()) {
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	425 *v = NULL;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	426 return -1;
715244108faa Raise OverflowError when appropriate on long->float conversion. Most of Tim Peters <tim.peters@gmail.com> parents: 19673 diff changeset	427 }
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	428 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	429 else {
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	430 Py_INCREF(Py_NotImplemented);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	431 *v = Py_NotImplemented;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	432 return -1;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	433 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	434 return 0;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	435 }
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	436
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	437 /* Precisions used by repr() and str(), respectively.
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	438
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	439 The repr() precision (17 significant decimal digits) is the minimal number
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	440 that is guaranteed to have enough precision so that if the number is read
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	441 back in the exact same binary value is recreated. This is true for IEEE
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	442 floating point by design, and also happens to work for all other modern
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	443 hardware.
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	444
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	445 The str() precision is chosen so that in most cases, the rounding noise
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	446 created by various operations is suppressed, while giving plenty of
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	447 precision for practical use.
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	448
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	449 */
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	450
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	451 #define PREC_REPR 17
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	452 #define PREC_STR 12
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	453
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	454 /* XXX PyFloat_AsString and PyFloat_AsReprString should be deprecated:
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	455 XXX they pass a char buffer without passing a length.
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	456 */
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	457 void
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	458 PyFloat_AsString(char buf, PyFloatObject v)
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	459 {
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	460 format_float(buf, 100, v, PREC_STR);
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	461 }
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	462
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	463 void
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	464 PyFloat_AsReprString(char buf, PyFloatObject v)
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	465 {
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	466 format_float(buf, 100, v, PREC_REPR);
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	467 }
fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17029 diff changeset	468
745 c7b23cc8cded answer lint's complaints Guido van Rossum <guido@python.org> parents: 632 diff changeset	469 /* ARGSUSED */
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 268 diff changeset	470 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	471 float_print(PyFloatObject v, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	473 char buf[100];
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	474 format_float(buf, sizeof(buf), v,
9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	475 (flags & Py_PRINT_RAW) ? PREC_STR : PREC_REPR);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42333 diff changeset	476 Py_BEGIN_ALLOW_THREADS
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	477 fputs(buf, fp);
43378 7630248b593c Add a bunch of GIL release/acquire points in tp_print implementations and for Brett Cannon <bcannon@gmail.com> parents: 42333 diff changeset	478 Py_END_ALLOW_THREADS
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 268 diff changeset	479 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	480 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	481
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	482 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	483 float_repr(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	484 {
44267 f909872917b9 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse. Christian Heimes <christian@cheimes.de> parents: 44262 diff changeset	485 char buf[100];
f909872917b9 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse. Christian Heimes <christian@cheimes.de> parents: 44262 diff changeset	486 format_float(buf, sizeof(buf), v, PREC_REPR);
f909872917b9 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse. Christian Heimes <christian@cheimes.de> parents: 44262 diff changeset	487
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	488 return PyString_FromString(buf);
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	489 }
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	490
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	491 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	492 float_str(PyFloatObject *v)
11631 cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	493 {
cf7a0f1b7b48 Implement the other easy thing: repr() of a float now uses %.17g, Guido van Rossum <guido@python.org> parents: 11383 diff changeset	494 char buf[100];
21097 9ba3c82946b8 PyFloat_AsStringEx(): This function takes an output char* but doesn't Tim Peters <tim.peters@gmail.com> parents: 21079 diff changeset	495 format_float(buf, sizeof(buf), v, PREC_STR);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	496 return PyString_FromString(buf);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	497 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	498
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	499 /* 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	500 * 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	501 * 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	502 * 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	503 * 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	504 * 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	505 * 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	506 * 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	507 * 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	508 * 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	509 * 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	510 * 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	511 * 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	512 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	513
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	514 static PyObject*
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	515 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	516 {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	517 double i, j;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	518 int r = 0;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	519
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	520 assert(PyFloat_Check(v));
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	521 i = PyFloat_AS_DOUBLE(v);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	522
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	523 /* Switch on the type of w. Set i and j to doubles to be compared,
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	524 * and op to the richcomp to use.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	525 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	526 if (PyFloat_Check(w))
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	527 j = PyFloat_AS_DOUBLE(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	528
38293 688f25757104 Added a new macro, Py_IS_FINITE(X). On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X). No change on other platforms Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 37815 diff changeset	529 else if (!Py_IS_FINITE(i)) {
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	530 if (PyInt_Check(w) \|\| PyLong_Check(w))
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	531 /* If i is an infinity, its magnitude exceeds any
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	532 * finite integer, so it doesn't matter which int we
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	533 * compare i with. If i is a NaN, similarly.
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	534 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	535 j = 0.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	536 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	537 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	538 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	539
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	540 else if (PyInt_Check(w)) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	541 long jj = PyInt_AS_LONG(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	542 /* In the worst realistic case I can imagine, C double is a
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	543 * Cray single with 48 bits of precision, and long has 64
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	544 * bits.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	545 */
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	546 #if SIZEOF_LONG > 6
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	547 unsigned long abs = (unsigned long)(jj < 0 ? -jj : jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	548 if (abs >> 48) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	549 /* Needs more than 48 bits. Make it take the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	550 * PyLong path.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	551 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	552 PyObject *result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	553 PyObject *ww = PyLong_FromLong(jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	554
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	555 if (ww == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	556 return NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	557 result = float_richcompare(v, ww, op);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	558 Py_DECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	559 return result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	560 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	561 #endif
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	562 j = (double)jj;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	563 assert((long)j == jj);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	564 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	565
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	566 else if (PyLong_Check(w)) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	567 int vsign = i == 0.0 ? 0 : i < 0.0 ? -1 : 1;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	568 int wsign = _PyLong_Sign(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	569 size_t nbits;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	570 int exponent;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	571
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	572 if (vsign != wsign) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	573 /* Magnitudes are irrelevant -- the signs alone
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	574 * determine the outcome.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	575 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	576 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	577 j = (double)wsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	578 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	579 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	580 /* The signs are the same. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	581 /* Convert w to a double if it fits. In particular, 0 fits. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	582 nbits = _PyLong_NumBits(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	583 if (nbits == (size_t)-1 && PyErr_Occurred()) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	584 /* This long is so large that size_t isn't big enough
33549 ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	585 * to hold the # of bits. Replace with little doubles
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	586 * that give the same outcome -- w is so large that
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	587 * its magnitude must exceed the magnitude of any
ecaf0e8fa737 float_richcompare(): Use the new Py_IS_NAN macro to ensure that, on Tim Peters <tim.peters@gmail.com> parents: 33547 diff changeset	588 * finite float.
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	589 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	590 PyErr_Clear();
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	591 i = (double)vsign;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	592 assert(wsign != 0);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	593 j = wsign * 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	594 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	595 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	596 if (nbits <= 48) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	597 j = PyLong_AsDouble(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	598 /* It's impossible that <= 48 bits overflowed. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	599 assert(j != -1.0 \|\| ! PyErr_Occurred());
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	600 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	601 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	602 assert(wsign != 0); /* else nbits was 0 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	603 assert(vsign != 0); /* if vsign were 0, then since wsign is
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	604 * not 0, we would have taken the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	605 * vsign != wsign branch at the start */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	606 /* We want to work with non-negative numbers. */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	607 if (vsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	608 /* "Multiply both sides" by -1; this also swaps the
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	609 * comparator.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	610 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	611 i = -i;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	612 op = _Py_SwappedOp[op];
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	613 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	614 assert(i > 0.0);
36235 9f66bdd5a061 Fix icc warnings: remove unused variable Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	615 (void) frexp(i, &exponent);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	616 /* exponent is the # of bits in v before the radix point;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	617 * we know that nbits (the # of bits in w) > 48 at this point
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	618 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	619 if (exponent < 0 \|\| (size_t)exponent < nbits) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	620 i = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	621 j = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	622 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	623 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	624 if ((size_t)exponent > nbits) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	625 i = 2.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	626 j = 1.0;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	627 goto Compare;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	628 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	629 /* v and w have the same number of bits before the radix
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	630 * point. Construct two longs that have the same comparison
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	631 * outcome.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	632 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	633 {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	634 double fracpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	635 double intpart;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	636 PyObject *result = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	637 PyObject *one = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	638 PyObject *vv = NULL;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	639 PyObject *ww = w;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	640
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	641 if (wsign < 0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	642 ww = PyNumber_Negative(w);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	643 if (ww == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	644 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	645 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	646 else
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	647 Py_INCREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	648
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	649 fracpart = modf(i, &intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	650 vv = PyLong_FromDouble(intpart);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	651 if (vv == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	652 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	653
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	654 if (fracpart != 0.0) {
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	655 /* Shift left, and or a 1 bit into vv
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	656 * to represent the lost fraction.
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	657 */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	658 PyObject *temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	659
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	660 one = PyInt_FromLong(1);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	661 if (one == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	662 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	663
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	664 temp = PyNumber_Lshift(ww, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	665 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	666 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	667 Py_DECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	668 ww = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	669
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	670 temp = PyNumber_Lshift(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	671 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	672 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	673 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	674 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	675
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	676 temp = PyNumber_Or(vv, one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	677 if (temp == NULL)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	678 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	679 Py_DECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	680 vv = temp;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	681 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	682
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	683 r = PyObject_RichCompareBool(vv, ww, op);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	684 if (r < 0)
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	685 goto Error;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	686 result = PyBool_FromLong(r);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	687 Error:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	688 Py_XDECREF(vv);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	689 Py_XDECREF(ww);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	690 Py_XDECREF(one);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	691 return result;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	692 }
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	693 } /* else if (PyLong_Check(w)) */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	694
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	695 else /* w isn't float, int, or long */
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	696 goto Unimplemented;
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	697
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	698 Compare:
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	699 PyFPE_START_PROTECT("richcompare", return NULL)
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	700 switch (op) {
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	701 case Py_EQ:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	702 r = i == j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	703 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	704 case Py_NE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	705 r = i != j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	706 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	707 case Py_LE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	708 r = i <= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	709 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	710 case Py_GE:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	711 r = i >= j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	712 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	713 case Py_LT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	714 r = i < j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	715 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	716 case Py_GT:
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	717 r = i > j;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	718 break;
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	719 }
31589 ca3c998afa55 Pass a variable that actually exists to PyFPE_END_PROTECT in Michael W. Hudson <mwh@python.net> parents: 31553 diff changeset	720 PyFPE_END_PROTECT(r)
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	721 return PyBool_FromLong(r);
33547 702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	722
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	723 Unimplemented:
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	724 Py_INCREF(Py_NotImplemented);
702367da2c72 SF bug #513866: Float/long comparison anomaly. Tim Peters <tim.peters@gmail.com> parents: 32533 diff changeset	725 return Py_NotImplemented;
31553 a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	726 }
a6d8d5ace6a7 "Fix" (for certain configurations of the planets, including Michael W. Hudson <mwh@python.net> parents: 31384 diff changeset	727
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	728 static long
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	729 float_hash(PyFloatObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	730 {
13976 5ada9fa54801 Fix for http://sourceforge.net/bugs/?func=detailbug&bug_id=111866&group_id=5470. Tim Peters <tim.peters@gmail.com> parents: 13944 diff changeset	731 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	732 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	733
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	734 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	735 float_add(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	736 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	737 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	738 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	739 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	740 PyFPE_START_PROTECT("add", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	741 a = a + b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	742 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	743 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	744 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	745
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	746 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	747 float_sub(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	748 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	749 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	750 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	751 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	752 PyFPE_START_PROTECT("subtract", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	753 a = a - b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	754 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	755 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	756 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	757
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	758 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	759 float_mul(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	760 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	761 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	762 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	763 CONVERT_TO_DOUBLE(w, b);
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	764 PyFPE_START_PROTECT("multiply", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	765 a = a * b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	766 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	767 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	768 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	769
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	770 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	771 float_div(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	772 {
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	773 double a,b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	774 CONVERT_TO_DOUBLE(v, a);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	775 CONVERT_TO_DOUBLE(w, b);
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	776 #ifdef Py_NAN
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	777 if (b == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	778 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	779 "float division");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	780 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	781 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	782 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	783 PyFPE_START_PROTECT("divide", return 0)
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	784 a = a / b;
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	785 PyFPE_END_PROTECT(a)
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	786 return PyFloat_FromDouble(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	787 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	788
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	789 static PyObject *
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	790 float_classic_div(PyObject v, PyObject w)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	791 {
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	792 double a,b;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	793 CONVERT_TO_DOUBLE(v, a);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	794 CONVERT_TO_DOUBLE(w, b);
19673 b3271297b984 PEP 238 documented -Qwarn as warning only for classic int or long Guido van Rossum <guido@python.org> parents: 19666 diff changeset	795 if (Py_DivisionWarningFlag >= 2 &&
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	796 PyErr_Warn(PyExc_DeprecationWarning, "classic float division") < 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	797 return NULL;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	798 #ifdef Py_NAN
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	799 if (b == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	800 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	801 "float division");
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	802 return NULL;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	803 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	804 #endif
19633 c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	805 PyFPE_START_PROTECT("divide", return 0)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	806 a = a / b;
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	807 PyFPE_END_PROTECT(a)
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	808 return PyFloat_FromDouble(a);
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	809 }
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	810
c0a44829bcd5 Add warning mode for classic division, almost exactly as specified in Guido van Rossum <guido@python.org> parents: 19590 diff changeset	811 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	812 float_rem(PyObject v, PyObject w)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	813 {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	814 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	815 double mod;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	816 CONVERT_TO_DOUBLE(v, vx);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	817 CONVERT_TO_DOUBLE(w, wx);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	818 #ifdef Py_NAN
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	819 if (wx == 0.0) {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	820 PyErr_SetString(PyExc_ZeroDivisionError,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	821 "float modulo");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	822 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	823 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	824 #endif
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	825 PyFPE_START_PROTECT("modulo", return 0)
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	826 mod = fmod(vx, wx);
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	827 /* note: checking mod*wx < 0 is incorrect -- underflows to
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	828 0 if wx < sqrt(smallest nonzero double) */
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	829 if (mod && ((wx < 0) != (mod < 0))) {
632 0c1938f2e0c0 Get rid of redundant type checks. Guido van Rossum <guido@python.org> parents: 496 diff changeset	830 mod += wx;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	831 }
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5118 diff changeset	832 PyFPE_END_PROTECT(mod)
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	833 return PyFloat_FromDouble(mod);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	834 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	835
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	836 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	837 float_divmod(PyObject v, PyObject w)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	838 {
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	839 double vx, wx;
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	840 double div, mod, floordiv;
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	841 CONVERT_TO_DOUBLE(v, vx);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	842 CONVERT_TO_DOUBLE(w, wx);
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	843 if (wx == 0.0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	844 PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	845 return NULL;
caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	846 }
5118 002865af55e5 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4933 diff changeset	847 PyFPE_START_PROTECT("divmod", return 0)
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	848 mod = fmod(vx, wx);
14616 284508c653c7 Fixed legit gripe from c.l.py that math.fmod docs aren't confusing enough. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	849 /* fmod is typically exact, so vx-mod is mathematically an
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	850 exact multiple of wx. But this is fp arithmetic, and fp
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	851 vx - mod is an approximation; the result is that div may
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	852 not be an exact integral value after the division, although
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	853 it will always be very close to one.
135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	854 */
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	855 div = (vx - mod) / wx;
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	856 if (mod) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	857 /* ensure the remainder has the same sign as the denominator */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	858 if ((wx < 0) != (mod < 0)) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	859 mod += wx;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	860 div -= 1.0;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	861 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	862 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	863 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	864 /* the remainder is zero, and in the presence of signed zeroes
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	865 fmod returns different results across platforms; ensure
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	866 it has the same sign as the denominator; we'd like to do
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	867 "mod = wx * 0.0", but that may get optimized away */
20829 14dc693af532 float_divmod(): the code wasn't sick enough to stop the MS optimizer Tim Peters <tim.peters@gmail.com> parents: 20827 diff changeset	868 mod = mod; / hide "mod = +0" from optimizer */
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	869 if (wx < 0.0)
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	870 mod = -mod;
391 caf8466dcc9c Finally implemented divmod(). Guido van Rossum <guido@python.org> parents: 284 diff changeset	871 }
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	872 /* snap quotient to nearest integral value */
20827 95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	873 if (div) {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	874 floordiv = floor(div);
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	875 if (div - floordiv > 0.5)
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	876 floordiv += 1.0;
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	877 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	878 else {
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	879 /* div is zero - get the same sign as the true quotient */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	880 div = div; / hide "div = +0" from optimizers */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	881 floordiv = div * vx / wx; /* zero w/ sign of vx/wx */
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	882 }
95201153251c SF bug #477221: abs and divmod act oddly with -0.0 Tim Peters <tim.peters@gmail.com> parents: 20826 diff changeset	883 PyFPE_END_PROTECT(floordiv)
10833 135c1ec9636c Tim Peters writes: Guido van Rossum <guido@python.org> parents: 10432 diff changeset	884 return Py_BuildValue("(dd)", floordiv, mod);
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	885 }
7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	886
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	887 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	888 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	889 {
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	890 PyObject t, r;
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	891
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	892 t = float_divmod(v, w);
21354 fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	893 if (t == NULL \|\| t == Py_NotImplemented)
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	894 return t;
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	895 assert(PyTuple_CheckExact(t));
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	896 r = PyTuple_GET_ITEM(t, 0);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	897 Py_INCREF(r);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	898 Py_DECREF(t);
fbddb64d21c2 float_floor_div: An expression like 3.//1j crashed the interpreter, or Tim Peters <tim.peters@gmail.com> parents: 21353 diff changeset	899 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	900 }
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	901
257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	902 static PyObject *
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	903 float_pow(PyObject v, PyObject w, PyObject *z)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	904 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	905 double iv, iw, ix;
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	906
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	907 if ((PyObject *)z != Py_None) {
19719 cdfdd5359411 Make the error msgs in our pow() implementations consistent. Tim Peters <tim.peters@gmail.com> parents: 19674 diff changeset	908 PyErr_SetString(PyExc_TypeError, "pow() 3rd argument not "
19753 c0580d8c193e Better error msg for 3-arg pow with a float argument. Tim Peters <tim.peters@gmail.com> parents: 19750 diff changeset	909 "allowed unless all arguments are integers");
19666 cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	910 return NULL;
cf65ebf87560 New restriction on pow(x, y, z): If z is not None, x and y must be of Tim Peters <tim.peters@gmail.com> parents: 19633 diff changeset	911 }
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	912
15723 ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	913 CONVERT_TO_DOUBLE(v, iv);
ac7ae3ead88a Make float a new style number type. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 15318 diff changeset	914 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	915
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	916 /* Sort out special cases here instead of relying on pow() */
19457 6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	917 if (iw == 0) { /* v0 is 1, even 00 */
41580 a68467cc06d3 Remove dead code. This code couldn't be reached because earlier in Neal Norwitz <nnorwitz@gmail.com> parents: 39642 diff changeset	918 return PyFloat_FromDouble(1.0);
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	919 }
19457 6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	920 if (iv == 0.0) { /* 0*w is error if w<0, else 1 /
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	921 if (iw < 0.0) {
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	922 PyErr_SetString(PyExc_ZeroDivisionError,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 15041 diff changeset	923 "0.0 cannot be raised to a negative power");
15041 7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	924 return NULL;
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	925 }
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	926 return PyFloat_FromDouble(0.0);
7eefde90ec0e SF bug 115831 and Ping's SF patch 101751, 0.0*-2.0 returns inf rather than Tim Peters <tim.peters@gmail.com>* parents: 14869 diff changeset	927 }
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	928 if (iv == 1.0) { /* 1w is 1, even 1inf and 1*nan /
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	929 return PyFloat_FromDouble(1.0);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	930 }
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	931 if (iv < 0.0) {
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	932 /* Whether this is an error is a mess, and bumps into libm
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	933 * bugs so we have to figure it out ourselves.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	934 */
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	935 if (iw != floor(iw)) {
44488 94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	936 PyErr_SetString(PyExc_ValueError, "negative number "
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	937 "cannot be raised to a fractional power");
94eeaeeb3ce9 Continue rolling back pep-3141 changes that changed behavior from 2.5. This Jeffrey Yasskin <jyasskin@gmail.com> parents: 44432 diff changeset	938 return NULL;
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	939 }
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	940 /* iw is an exact integer, albeit perhaps a very large one.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	941 * -1 raised to an exact integer should never be exceptional.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	942 * Alas, some libms (chiefly glibc as of early 2003) return
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	943 * NaN and set EDOM on pow(-1, large_int) if the int doesn't
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	944 * happen to be representable in a C integer. That's a
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	945 * bug; we let that slide in math.pow() (which currently
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	946 * reflects all platform accidents), but not for Python's **.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	947 */
38293 688f25757104 Added a new macro, Py_IS_FINITE(X). On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X). No change on other platforms Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 37815 diff changeset	948 if (iv == -1.0 && Py_IS_FINITE(iw)) {
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	949 /* Return 1 if iw is even, -1 if iw is odd; there's
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	950 * no guarantee that any C integral type is big
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	951 * enough to hold iw, so we have to check this
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	952 * indirectly.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	953 */
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	954 ix = floor(iw * 0.5) * 2.0;
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	955 return PyFloat_FromDouble(ix == iw ? 1.0 : -1.0);
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	956 }
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	957 /* Else iv != -1.0, and overflow or underflow are possible.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	958 * Unless we're to write pow() ourselves, we have to trust
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	959 * the platform to do this correctly.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	960 */
3984 0613f17dcfd8 Correct wrong calculation of pow(0.0, 0.0, negative_number) Guido van Rossum <guido@python.org> parents: 3704 diff changeset	961 }
19457 6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	962 errno = 0;
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	963 PyFPE_START_PROTECT("pow", return NULL)
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	964 ix = pow(iv, iw);
6c2b7b624ef2 float_pow: Put all of the burden on the libm pow in normal Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	965 PyFPE_END_PROTECT(ix)
22228 4b6eda7d0c8f backport tim_one's checkin of Michael W. Hudson <mwh@python.net> parents: 21354 diff changeset	966 Py_ADJUST_ERANGE1(ix);
39642 981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	967 if (errno != 0) {
29252 0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	968 /* We don't expect any errno value other than ERANGE, but
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	969 * the range of libm bugs appears unbounded.
0b76679bf3f9 SF bug 705231: Assertion failed, python aborts. Tim Peters <tim.peters@gmail.com> parents: 28368 diff changeset	970 */
39642 981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	971 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
981181d2a4fe Reverting the patch that tried to fix the issue whereby x*2 raises Alex Martelli <aleaxit@gmail.com>* parents: 39639 diff changeset	972 PyExc_ValueError);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973 return NULL;
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	974 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	975 return PyFloat_FromDouble(ix);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	976 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	977
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	978 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	979 float_neg(PyFloatObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	980 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	981 return PyFloat_FromDouble(-v->ob_fval);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	982 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	983
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	984 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	985 float_abs(PyFloatObject *v)
227 7ec6058b539b Added (dummy) divmod and (functional) abs. Guido van Rossum <guido@python.org> parents: 145 diff changeset	986 {
20826 3751366c2f39 float_abs() again: Guido pointed out that this could screw up in the Tim Peters <tim.peters@gmail.com> parents: 20823 diff changeset	987 return PyFloat_FromDouble(fabs(v->ob_fval));
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	988 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	989
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	990 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	991 float_nonzero(PyFloatObject *v)
239 fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	992 {
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	993 return v->ob_fval != 0.0;
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	994 }
fda973f2a512 Added nonzero test Guido van Rossum <guido@python.org> parents: 227 diff changeset	995
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1271 diff changeset	996 static int
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	997 float_coerce(PyObject pv, PyObject pw)
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	998 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	999 if (PyInt_Check(*pw)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1000 long x = PyInt_AsLong(*pw);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1001 *pw = PyFloat_FromDouble((double)x);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1002 Py_INCREF(*pv);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1003 return 0;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1004 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1005 else if (PyLong_Check(*pw)) {
27484 5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	1006 double x = PyLong_AsDouble(*pw);
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	1007 if (x == -1.0 && PyErr_Occurred())
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	1008 return -1;
5ba7934a7ba0 Fix SF bug# 676155, RuntimeWarning with tp_compare Neal Norwitz <nnorwitz@gmail.com> parents: 26328 diff changeset	1009 *pw = PyFloat_FromDouble(x);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1010 Py_INCREF(*pv);
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1011 return 0;
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1012 }
19976 da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	1013 else if (PyFloat_Check(*pw)) {
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	1014 Py_INCREF(*pv);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	1015 Py_INCREF(*pw);
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	1016 return 0;
da00188d5270 Add additional coercion support for "self subtypes" to int, long, Guido van Rossum <guido@python.org> parents: 19889 diff changeset	1017 }
955 03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1018 return 1; /* Can't do it */
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1019 }
03de67080c95 * classobject.[ch], {float,long,int}object.c, bltinmodule.c: Guido van Rossum <guido@python.org> parents: 795 diff changeset	1020
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1021 static PyObject *
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1022 float_is_integer(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1023 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1024 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1025 PyObject *o;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1026
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1027 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1028 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1029 if (!Py_IS_FINITE(x))
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1030 Py_RETURN_FALSE;
46792 8baeba13ae93 Issue #2801: fix bug in float.is_integer where ValueError Mark Dickinson <dickinsm@gmail.com> parents: 46473 diff changeset	1031 errno = 0;
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1032 PyFPE_START_PROTECT("is_integer", return NULL)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1033 o = (floor(x) == x) ? Py_True : Py_False;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1034 PyFPE_END_PROTECT(x)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1035 if (errno != 0) {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1036 PyErr_SetFromErrno(errno == ERANGE ? PyExc_OverflowError :
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1037 PyExc_ValueError);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1038 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1039 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1040 Py_INCREF(o);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1041 return o;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1042 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1043
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1044 #if 0
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1045 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1046 float_is_inf(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1047 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1048 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1049 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1050 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1051 return PyBool_FromLong((long)Py_IS_INFINITY(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1052 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1053
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1054 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1055 float_is_nan(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1056 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1057 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1058 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1059 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1060 return PyBool_FromLong((long)Py_IS_NAN(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1061 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1062
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1063 static PyObject *
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1064 float_is_finite(PyObject *v)
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1065 {
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1066 double x = PyFloat_AsDouble(v);
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1067 if (x == -1.0 && PyErr_Occurred())
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1068 return NULL;
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1069 return PyBool_FromLong((long)Py_IS_FINITE(x));
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1070 }
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1071 #endif
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1072
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1073 static PyObject *
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1074 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	1075 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1076 double x = PyFloat_AsDouble(v);
18838 a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1077 double wholepart; /* integral portion of x, rounded toward 0 */
a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1078
a8575f358b9f SF bug #444510: int() should guarantee truncation. Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	1079 (void)modf(x, &wholepart);
26328 f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1080 /* Try to get out cheap if this fits in a Python int. The attempt
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1081 * to cast to long must be protected, as C doesn't define what
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1082 * happens if the double is too big to fit in a long. Some rare
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1083 * systems raise an exception then (RISCOS was mentioned as one,
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1084 * and someone using a non-default option on Sun also bumped into
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1085 * that). Note that checking for >= and <= LONG_{MIN,MAX} would
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1086 * still be vulnerable: if a long has more bits of precision than
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1087 * a double, casting MIN/MAX to double may yield an approximation,
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1088 * and if that's rounded up, then, e.g., wholepart=LONG_MAX+1 would
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1089 * yield true from the C expression wholepart<=LONG_MAX, despite
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1090 * that wholepart is actually greater than LONG_MAX.
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1091 */
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1092 if (LONG_MIN < wholepart && wholepart < LONG_MAX) {
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1093 const long aslong = (long)wholepart;
f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1094 return PyInt_FromLong(aslong);
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20277 diff changeset	1095 }
26328 f3a69037fdf0 float_int(): Some systems raise an exception if a double is cast to Tim Peters <tim.peters@gmail.com> parents: 26291 diff changeset	1096 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	1097 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1098
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1099 static PyObject *
13454 fcc75a3748f5 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13447 diff changeset	1100 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	1101 {
34931 9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1102 if (PyFloat_CheckExact(v))
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1103 Py_INCREF(v);
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1104 else
9a1b1e1ae653 Make subclasses of int, long, complex, float, and unicode perform type Brett Cannon <bcannon@gmail.com> parents: 33549 diff changeset	1105 v = PyFloat_FromDouble(((PyFloatObject *)v)->ob_fval);
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1106 return v;
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1107 }
2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1108
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1109 static PyObject *
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1110 float_as_integer_ratio(PyObject v, PyObject unused)
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1111 {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1112 double self;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1113 double float_part;
45099 d0b31f24694d Fix int/long typecase. Add check for non-binary floating point. Raymond Hettinger <python@rcn.com> parents: 45096 diff changeset	1114 int exponent;
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1115 int i;
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1116
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1117 PyObject *prev;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1118 PyObject *py_exponent = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1119 PyObject *numerator = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1120 PyObject *denominator = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1121 PyObject *result_pair = NULL;
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1122 PyNumberMethods *long_methods = PyLong_Type.tp_as_number;
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1123
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1124 #define INPLACE_UPDATE(obj, call) \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1125 prev = obj; \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1126 obj = call; \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1127 Py_DECREF(prev); \
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1128
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1129 CONVERT_TO_DOUBLE(v, self);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1130
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1131 if (Py_IS_INFINITY(self)) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1132 PyErr_SetString(PyExc_OverflowError,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1133 "Cannot pass infinity to float.as_integer_ratio.");
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1134 return NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1135 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1136 #ifdef Py_NAN
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1137 if (Py_IS_NAN(self)) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1138 PyErr_SetString(PyExc_ValueError,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1139 "Cannot pass nan to float.as_integer_ratio.");
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1140 return NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1141 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1142 #endif
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1143
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1144 PyFPE_START_PROTECT("as_integer_ratio", goto error);
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1145 float_part = frexp(self, &exponent); /* self == float_part * 2*exponent exactly /
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1146 PyFPE_END_PROTECT(float_part);
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1147
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1148 for (i=0; i<300 && float_part != floor(float_part) ; i++) {
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1149 float_part *= 2.0;
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1150 exponent--;
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1151 }
45101 f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1152 /* self == float_part * 2**exponent exactly and float_part is integral.
f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1153 If FLT_RADIX != 2, the 300 steps may leave a tiny fractional part
f5e18c9bde70 Simpler solution to handling non-IEEE 754 environments. Raymond Hettinger <python@rcn.com> parents: 45100 diff changeset	1154 to be truncated by PyLong_FromDouble(). */
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1155
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1156 numerator = PyLong_FromDouble(float_part);
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1157 if (numerator == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1158
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1159 /* fold in 2*exponent /
45095 5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1160 denominator = PyLong_FromLong(1);
45099 d0b31f24694d Fix int/long typecase. Add check for non-binary floating point. Raymond Hettinger <python@rcn.com> parents: 45096 diff changeset	1161 py_exponent = PyLong_FromLong(labs((long)exponent));
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1162 if (py_exponent == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1163 INPLACE_UPDATE(py_exponent,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1164 long_methods->nb_lshift(denominator, py_exponent));
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1165 if (py_exponent == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1166 if (exponent > 0) {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1167 INPLACE_UPDATE(numerator,
45100 0b4e8afed663 Add protection from weirdness while scaling the mantissa to an integer. Raymond Hettinger <python@rcn.com> parents: 45099 diff changeset	1168 long_methods->nb_multiply(numerator, py_exponent));
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1169 if (numerator == NULL) goto error;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1170 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1171 else {
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1172 Py_DECREF(denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1173 denominator = py_exponent;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1174 py_exponent = NULL;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1175 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1176
45095 5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1177 /* Returns ints instead of longs where possible */
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1178 INPLACE_UPDATE(numerator, PyNumber_Int(numerator));
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1179 if (numerator == NULL) goto error;
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1180 INPLACE_UPDATE(denominator, PyNumber_Int(denominator));
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1181 if (denominator == NULL) goto error;
5cb8288360e7 Integer ratio should return ints instead of longs whereever possible. Raymond Hettinger <python@rcn.com> parents: 45094 diff changeset	1182
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1183 result_pair = PyTuple_Pack(2, numerator, denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1184
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1185 #undef INPLACE_UPDATE
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1186 error:
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1187 Py_XDECREF(py_exponent);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1188 Py_XDECREF(denominator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1189 Py_XDECREF(numerator);
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1190 return result_pair;
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1191 }
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1192
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1193 PyDoc_STRVAR(float_as_integer_ratio_doc,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1194 "float.as_integer_ratio() -> (int, int)\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1195 "\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1196 "Returns a pair of integers, whose ratio is exactly equal to the original\n"
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1197 "float and with a positive denominator.\n"
beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1198 "Raises OverflowError on infinities and a ValueError on nans.\n"
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1199 "\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1200 ">>> (10.0).as_integer_ratio()\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1201 "(10, 1)\n"
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1202 ">>> (0.0).as_integer_ratio()\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1203 "(0, 1)\n"
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1204 ">>> (-.25).as_integer_ratio()\n"
45094 beea73ca2b88 Issue #1996: float.as_integer_ratio() should return fraction in lowest terms. Raymond Hettinger <python@rcn.com> parents: 45060 diff changeset	1205 "(-1, 4)");
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1206
1049 2ed511171809 Made builtins int(), long(), float(), oct() and hex() more generic. Guido van Rossum <guido@python.org> parents: 955 diff changeset	1207
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	1208 static PyObject *
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1209 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	1210
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1211 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1212 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	1213 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1214 PyObject x = Py_False; / Integer zero */
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	1215 static char *kwlist[] = {"x", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1216
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1217 if (type != &PyFloat_Type)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1218 return float_subtype_new(type, args, kwds); /* Wimp out */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1219 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:float", kwlist, &x))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1220 return NULL;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1221 if (PyString_Check(x))
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1222 return PyFloat_FromString(x, NULL);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1223 return PyNumber_Float(x);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1224 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1225
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1226 /* 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	1227 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	1228 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	1229 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	1230 */
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1231 static PyObject *
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1232 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	1233 {
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1234 PyObject tmp, newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1235
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1236 assert(PyType_IsSubtype(type, &PyFloat_Type));
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1237 tmp = float_new(&PyFloat_Type, args, kwds);
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1238 if (tmp == NULL)
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1239 return NULL;
19889 733314fcfdaa Again perhaps the end of [#460020] bug or feature: unicode() and subclasses. Tim Peters <tim.peters@gmail.com> parents: 19879 diff changeset	1240 assert(PyFloat_CheckExact(tmp));
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1241 newobj = type->tp_alloc(type, 0);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1242 if (newobj == NULL) {
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29252 diff changeset	1243 Py_DECREF(tmp);
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1244 return NULL;
29641 4909aa64405f SF patch 703666: Several objects don't decref tmp on failure in subtype_new Raymond Hettinger <python@rcn.com> parents: 29252 diff changeset	1245 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1246 ((PyFloatObject )newobj)->ob_fval = ((PyFloatObject )tmp)->ob_fval;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1247 Py_DECREF(tmp);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 37304 diff changeset	1248 return newobj;
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1249 }
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1250
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1251 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1252 float_getnewargs(PyFloatObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1253 {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1254 return Py_BuildValue("(d)", v->ob_fval);
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1255 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1256
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1257 /* 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	1258
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1259 typedef enum {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1260 unknown_format, ieee_big_endian_format, ieee_little_endian_format
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1261 } float_format_type;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1262
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1263 static float_format_type double_format, float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1264 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	1265
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1266 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1267 float_getformat(PyTypeObject v, PyObject arg)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1268 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1269 char* s;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1270 float_format_type r;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1271
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1272 if (!PyString_Check(arg)) {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1273 PyErr_Format(PyExc_TypeError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1274 "__getformat__() argument must be string, not %.500s",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1275 Py_TYPE(arg)->tp_name);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1276 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1277 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1278 s = PyString_AS_STRING(arg);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1279 if (strcmp(s, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1280 r = double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1281 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1282 else if (strcmp(s, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1283 r = float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1284 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1285 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1286 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1287 "__getformat__() argument 1 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1288 "'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1289 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1290 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1291
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1292 switch (r) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1293 case unknown_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1294 return PyString_FromString("unknown");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1295 case ieee_little_endian_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1296 return PyString_FromString("IEEE, little-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1297 case ieee_big_endian_format:
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47392 diff changeset	1298 return PyString_FromString("IEEE, big-endian");
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1299 default:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1300 Py_FatalError("insane float_format or double_format");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1301 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1302 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1303 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1304
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1305 PyDoc_STRVAR(float_getformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1306 "float.__getformat__(typestr) -> string\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1307 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1308 "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	1309 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1310 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1311 "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	1312 "'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	1313 "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	1314
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1315 static PyObject *
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1316 float_setformat(PyTypeObject v, PyObject args)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1317 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1318 char* typestr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1319 char* format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1320 float_format_type f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1321 float_format_type detected;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1322 float_format_type *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1323
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1324 if (!PyArg_ParseTuple(args, "ss:__setformat__", &typestr, &format))
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1325 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1326
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1327 if (strcmp(typestr, "double") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1328 p = &double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1329 detected = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1330 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1331 else if (strcmp(typestr, "float") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1332 p = &float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1333 detected = detected_float_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1334 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1335 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1336 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1337 "__setformat__() argument 1 must "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1338 "be 'double' or 'float'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1339 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1340 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1341
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1342 if (strcmp(format, "unknown") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1343 f = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1344 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1345 else if (strcmp(format, "IEEE, little-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1346 f = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1347 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1348 else if (strcmp(format, "IEEE, big-endian") == 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1349 f = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1350 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1351 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1352 PyErr_SetString(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1353 "__setformat__() argument 2 must be "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1354 "'unknown', 'IEEE, little-endian' or "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1355 "'IEEE, big-endian'");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1356 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1357
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1358 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1359
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1360 if (f != unknown_format && f != detected) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1361 PyErr_Format(PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1362 "can only set %s format to 'unknown' or the "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1363 "detected platform value", typestr);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1364 return NULL;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1365 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1366
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1367 *p = f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1368 Py_RETURN_NONE;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1369 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1370
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1371 PyDoc_STRVAR(float_setformat_doc,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1372 "float.__setformat__(typestr, fmt) -> None\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1373 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1374 "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	1375 "used in Python's test suite.\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1376 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1377 "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	1378 "'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	1379 "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	1380 "\n"
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1381 "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	1382 "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	1383
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1384 static PyObject *
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1385 float_getzero(PyObject v, void closure)
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1386 {
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1387 return PyFloat_FromDouble(0.0);
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1388 }
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1389
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1390 static PyObject *
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1391 float__format__(PyObject self, PyObject args)
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1392 {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1393 PyObject *format_spec;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1394
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1395 if (!PyArg_ParseTuple(args, "O:__format__", &format_spec))
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1396 return NULL;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46792 diff changeset	1397 if (PyBytes_Check(format_spec))
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1398 return _PyFloat_FormatAdvanced(self,
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1399 PyBytes_AS_STRING(format_spec),
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1400 PyBytes_GET_SIZE(format_spec));
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1401 if (PyUnicode_Check(format_spec)) {
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1402 /* Convert format_spec to a str */
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1403 PyObject *result;
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1404 PyObject *str_spec = PyObject_Str(format_spec);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1405
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1406 if (str_spec == NULL)
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1407 return NULL;
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1408
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1409 result = _PyFloat_FormatAdvanced(self,
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1410 PyBytes_AS_STRING(str_spec),
47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1411 PyBytes_GET_SIZE(str_spec));
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1412
47392 47ef9a806ce9 Refactor and clean up str.format() code (and helpers) in advance of optimizations. Eric Smith <eric@trueblade.com> parents: 47294 diff changeset	1413 Py_DECREF(str_spec);
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1414 return result;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1415 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1416 PyErr_SetString(PyExc_TypeError, "__format__ requires str or unicode");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1417 return NULL;
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1418 }
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1419
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1420 PyDoc_STRVAR(float__format__doc,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1421 "float.__format__(format_spec) -> string\n"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1422 "\n"
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1423 "Formats the float according to format_spec.");
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1424
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1425
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1426 static PyMethodDef float_methods[] = {
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1427 {"conjugate", (PyCFunction)float_float, METH_NOARGS,
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1428 "Returns self, the complex conjugate of any float."},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1429 {"__trunc__", (PyCFunction)float_trunc, METH_NOARGS,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1430 "Returns the Integral closest to x between 0 and x."},
45024 f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1431 {"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS,
f062dda54894 Moved Rational._binary_float_to_ratio() to float.as_integer_ratio() because Jeffrey Yasskin <jyasskin@gmail.com> parents: 44940 diff changeset	1432 float_as_integer_ratio_doc},
46473 5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1433 {"is_integer", (PyCFunction)float_is_integer, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1434 "Returns True if the float is an integer."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1435 #if 0
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1436 {"is_inf", (PyCFunction)float_is_inf, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1437 "Returns True if the float is positive or negative infinite."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1438 {"is_finite", (PyCFunction)float_is_finite, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1439 "Returns True if the float is finite, neither infinite nor NaN."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1440 {"is_nan", (PyCFunction)float_is_nan, METH_NOARGS,
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1441 "Returns True if the float is not a number (NaN)."},
5bc7b20dc04a I finally got the time to update and merge Mark's and my trunk-math branch. The patch is collaborated work of Mark Dickinson and me. It was mostly done a few months ago. The patch fixes a lot of loose ends and edge cases related to operations with NaN, INF, very small values and complex math. Christian Heimes <christian@cheimes.de> parents: 46154 diff changeset	1442 #endif
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1443 {"__getnewargs__", (PyCFunction)float_getnewargs, METH_NOARGS},
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1444 {"__getformat__", (PyCFunction)float_getformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1445 METH_O\|METH_CLASS, float_getformat_doc},
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1446 {"__setformat__", (PyCFunction)float_setformat,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1447 METH_VARARGS\|METH_CLASS, float_setformat_doc},
45381 b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1448 {"__format__", (PyCFunction)float__format__,
b7231bf6bfb7 Backport of PEP 3101, Advanced String Formatting, from py3k. Eric Smith <eric@trueblade.com> parents: 45143 diff changeset	1449 METH_VARARGS, float__format__doc},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1450 {NULL, NULL} /* sentinel */
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1451 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1452
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1453 static PyGetSetDef float_getset[] = {
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1454 {"real",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1455 (getter)float_float, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1456 "the real part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1457 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1458 {"imag",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1459 (getter)float_getzero, (setter)NULL,
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1460 "the imaginary part of a complex number",
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1461 NULL},
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1462 {NULL} /* Sentinel */
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1463 };
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1464
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	1465 PyDoc_STRVAR(float_doc,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1466 "float(x) -> floating point number\n\
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1467 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23344 diff changeset	1468 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	1469
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1470
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1471 static PyNumberMethods float_as_number = {
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1472 float_add, /nb_add/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1473 float_sub, /nb_subtract/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1474 float_mul, /nb_multiply/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1475 float_classic_div, /nb_divide/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1476 float_rem, /nb_remainder/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1477 float_divmod, /nb_divmod/
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1478 float_pow, /nb_power/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	1479 (unaryfunc)float_neg, /nb_negative/
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1480 (unaryfunc)float_float, /nb_positive/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	1481 (unaryfunc)float_abs, /nb_absolute/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1347 diff changeset	1482 (inquiry)float_nonzero, /nb_nonzero/
405 d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1483 0, /nb_invert/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1484 0, /nb_lshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1485 0, /nb_rshift/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1486 0, /nb_and/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1487 0, /nb_xor/
d3d328680328 Added NULL function pointers for shift and mask ops. Guido van Rossum <guido@python.org> parents: 391 diff changeset	1488 0, /nb_or/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1489 float_coerce, /nb_coerce/
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1490 float_trunc, /nb_int/
4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1491 float_trunc, /nb_long/
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1492 float_float, /nb_float/
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1493 0, /* nb_oct */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1494 0, /* nb_hex */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1495 0, /* nb_inplace_add */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1496 0, /* nb_inplace_subtract */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1497 0, /* nb_inplace_multiply */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1498 0, /* nb_inplace_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1499 0, /* nb_inplace_remainder */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1500 0, /* nb_inplace_power */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1501 0, /* nb_inplace_lshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1502 0, /* nb_inplace_rshift */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1503 0, /* nb_inplace_and */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1504 0, /* nb_inplace_xor */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1505 0, /* nb_inplace_or */
21353 257c938900a6 float_int_div(): For clarity, move this closer to the other float Tim Peters <tim.peters@gmail.com> parents: 21097 diff changeset	1506 float_floor_div, /* nb_floor_divide */
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1507 float_div, /* nb_true_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1508 0, /* nb_inplace_floor_divide */
f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18933 diff changeset	1509 0, /* nb_inplace_true_divide */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1510 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1511
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1512 PyTypeObject PyFloat_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41580 diff changeset	1513 PyVarObject_HEAD_INIT(&PyType_Type, 0)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1514 "float",
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1515 sizeof(PyFloatObject),
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1516 0,
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1517 (destructor)float_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1518 (printfunc)float_print, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1519 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1520 0, /* tp_setattr */
32150 65f9ad9bc829 Remove float_compare as per Michael W. Hudson <mwh@python.net> parents: 31590 diff changeset	1521 0, /* tp_compare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1522 (reprfunc)float_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1523 &float_as_number, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1524 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1525 0, /* tp_as_mapping */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1526 (hashfunc)float_hash, /* tp_hash */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1527 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1528 (reprfunc)float_str, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1529 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1530 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1531 0, /* tp_as_buffer */
19552 6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1532 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_CHECKTYPES \|
6c30d20d27f2 Make int, long and float subclassable. Guido van Rossum <guido@python.org> parents: 19457 diff changeset	1533 Py_TPFLAGS_BASETYPE, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1534 float_doc, /* tp_doc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1535 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1536 0, /* tp_clear */
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 36759 diff changeset	1537 float_richcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1538 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1539 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1540 0, /* tp_iternext */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 27484 diff changeset	1541 float_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1542 0, /* tp_members */
44432 4f9723d9ca32 Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just Jeffrey Yasskin <jyasskin@gmail.com> parents: 44350 diff changeset	1543 float_getset, /* tp_getset */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1544 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1545 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1546 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1547 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1548 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1549 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1550 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18838 diff changeset	1551 float_new, /* tp_new */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552 };
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1553
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1554 void
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1555 _PyFloat_Init(void)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1556 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1557 /* We attempt to determine if this machine is using IEEE
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1558 floating point formats by peering at the bits of some
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1559 carefully chosen values. If it looks like we are on an
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1560 IEEE platform, the float packing/unpacking routines can
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1561 just copy bits, if not they resort to arithmetic & shifts
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1562 and masks. The shifts & masks approach works on all finite
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1563 values, but what happens to infinities, NaNs and signed
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1564 zeroes on packing is an accident, and attempting to unpack
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1565 a NaN or an infinity will raise an exception.
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1566
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1567 Note that if we're on some whacked-out platform which uses
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1568 IEEE formats but isn't strictly little-endian or big-
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1569 endian, we will fall back to the portable shifts & masks
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1570 method. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1571
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1572 #if SIZEOF_DOUBLE == 8
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1573 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1574 double x = 9006104071832581.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1575 if (memcmp(&x, "\x43\x3f\xff\x01\x02\x03\x04\x05", 8) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1576 detected_double_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1577 else if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1578 detected_double_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1579 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1580 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1581 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1582 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1583 detected_double_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1584 #endif
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1585
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1586 #if SIZEOF_FLOAT == 4
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1587 {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1588 float y = 16711938.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1589 if (memcmp(&y, "\x4b\x7f\x01\x02", 4) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1590 detected_float_format = ieee_big_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1591 else if (memcmp(&y, "\x02\x01\x7f\x4b", 4) == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1592 detected_float_format = ieee_little_endian_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1593 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1594 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1595 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1596 #else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1597 detected_float_format = unknown_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1598 #endif
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1599
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1600 double_format = detected_double_format;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1601 float_format = detected_float_format;
44267 f909872917b9 The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse. Christian Heimes <christian@cheimes.de> parents: 44262 diff changeset	1602
45060 c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	1603 /* Init float info */
c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	1604 if (FloatInfoType.tp_name == 0)
c05ee77b39f2 The previous change was causing a segfault after multiple calls to Py_Initialize() and Py_Finalize(). Christian Heimes <christian@cheimes.de> parents: 45059 diff changeset	1605 PyStructSequence_InitType(&FloatInfoType, &floatinfo_desc);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1606 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1607
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1608 void
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1609 PyFloat_CompactFreeList(size_t pbc, size_t pbf, size_t *bsum)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1610 {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1611 PyFloatObject *p;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1612 PyFloatBlock list, next;
32533 201986d6d9d6 Fix a couple of signed/unsigned comparison warnings Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	1613 unsigned i;
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1614 size_t bc = 0, bf = 0; /* block count, number of freed blocks */
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1615 size_t fsum = 0; /* total unfreed ints */
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1616 int frem; /* remaining unfreed ints per block */
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	1617
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1618 list = block_list;
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1619 block_list = NULL;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1620 free_list = NULL;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1621 while (list != NULL) {
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1622 bc++;
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1623 frem = 0;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1624 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1625 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1626 i++, p++) {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1627 if (PyFloat_CheckExact(p) && Py_REFCNT(p) != 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	1628 frem++;
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1629 }
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1630 next = list->next;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1631 if (frem) {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1632 list->next = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1633 block_list = list;
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1634 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1635 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1636 i++, p++) {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19753 diff changeset	1637 if (!PyFloat_CheckExact(p) \|\|
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1638 Py_REFCNT(p) == 0) {
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1639 Py_TYPE(p) = (struct _typeobject *)
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1640 free_list;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1641 free_list = p;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1642 }
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1643 }
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	1644 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1645 else {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12248 diff changeset	1646 PyMem_FREE(list); /* XXX PyObject_FREE ??? */
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	1647 bf++;
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1648 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1649 fsum += frem;
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1650 list = next;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1651 }
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1652 *pbc = bc;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1653 *pbf = bf;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1654 *bsum = fsum;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1655 }
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1656
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1657 void
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1658 PyFloat_Fini(void)
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1659 {
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1660 PyFloatObject *p;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1661 PyFloatBlock *list;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1662 unsigned i;
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1663 size_t bc, bf; /* block count, number of freed blocks */
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1664 size_t fsum; /* total unfreed floats per block */
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1665
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1666 PyFloat_CompactFreeList(&bc, &bf, &fsum);
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1667
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1668 if (!Py_VerboseFlag)
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1669 return;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1670 fprintf(stderr, "# cleanup floats");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1671 if (!fsum) {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1672 fprintf(stderr, "\n");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1673 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1674 else {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1675 fprintf(stderr,
46135 6f131d2c3628 Pluralss only need one s, not 2 (intss -> ints) Neal Norwitz <nnorwitz@gmail.com> parents: 45759 diff changeset	1676 ": %" PY_FORMAT_SIZE_T "d unfreed float%s in %"
45143 8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1677 PY_FORMAT_SIZE_T "d out of %"
8fdd6d62ea55 Patch #1953 Christian Heimes <christian@cheimes.de> parents: 45101 diff changeset	1678 PY_FORMAT_SIZE_T "d block%s\n",
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1679 fsum, fsum == 1 ? "" : "s",
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1680 bc - bf, bc, bc == 1 ? "" : "s");
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1681 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1682 if (Py_VerboseFlag > 1) {
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1683 list = block_list;
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1684 while (list != NULL) {
10432 1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1685 for (i = 0, p = &list->objects[0];
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1686 i < N_FLOATOBJECTS;
1cc5d20d2ed8 Fix a problem with Vladimir's PyFloat_Fini code: clear the free list; if Guido van Rossum <guido@python.org> parents: 10391 diff changeset	1687 i++, p++) {
19865 f2a3009b528e Replace a few places where X->ob_type was compared to &PyXXX_Type with Guido van Rossum <guido@python.org> parents: 19753 diff changeset	1688 if (PyFloat_CheckExact(p) &&
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1689 Py_REFCNT(p) != 0) {
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1690 char buf[100];
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1691 PyFloat_AsString(buf, p);
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	1692 /* XXX(twouters) cast refcount to
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	1693 long until %zd is universally
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	1694 available
83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	1695 */
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1696 fprintf(stderr,
36759 83b860acfe95 Use %ld and casts to long for refcount printing, in absense of a universally Thomas Wouters <thomas@python.org> parents: 36675 diff changeset	1697 "# <float at %p, refcnt=%ld, val=%s>\n",
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 44344 diff changeset	1698 p, (long)Py_REFCNT(p), buf);
10391 7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1699 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1700 }
7b810aa35b5c Vladimir has restructured his code somewhat so that the blocks are now Guido van Rossum <guido@python.org> parents: 10382 diff changeset	1701 list = list->next;
10382 e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1702 }
e2a08a81e56f OK, try again. Vladimir gave me a fix for the alignment bus error, Guido van Rossum <guido@python.org> parents: 10375 diff changeset	1703 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5504 diff changeset	1704 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1705
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1706 /*----------------------------------------------------------------------------
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1707 * _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	1708 */
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1709 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1710 _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	1711 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1712 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1713 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1714 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1715 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1716 unsigned int fbits;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1717 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1718
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1719 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1720 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1721 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1722 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1723
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1724 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1725 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1726 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1727 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1728 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1729 sign = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1730
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1731 f = frexp(x, &e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1732
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1733 /* Normalize f to be in the range [1.0, 2.0) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1734 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1735 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1736 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1737 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1738 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1739 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1740 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1741 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1742 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1743 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1744 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1745
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1746 if (e >= 128)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1747 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1748 else if (e < -126) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1749 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1750 f = ldexp(f, 126 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1751 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1752 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1753 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1754 e += 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1755 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1756 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1757
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1758 f = 8388608.0; / 2*23 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1759 fbits = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1760 assert(fbits <= 8388608);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1761 if (fbits >> 23) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1762 /* The carry propagated out of a string of 23 1 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1763 fbits = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1764 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1765 if (e >= 255)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1766 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1767 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1768
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1769 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1770 *p = (sign << 7) \| (e >> 1);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1771 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1772
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1773 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1774 *p = (char) (((e & 1) << 7) \| (fbits >> 16));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1775 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1776
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1777 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1778 *p = (fbits >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1779 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1780
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1781 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1782 *p = fbits & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1783
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1784 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1785 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1786
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1787 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1788 else {
35178 cf7a849ce61f Apparently some compiler gives a warning on Michael W. Hudson <mwh@python.net> parents: 34972 diff changeset	1789 float y = (float)x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1790 const char s = (char)&y;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1791 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	1792
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1793 if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1794 goto Overflow;
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1795
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1796 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1797 \|\| (float_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1798 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1799 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1800 }
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1801
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1802 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1803 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1804 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1805 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1806 return 0;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1807 }
45759 354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1808 Overflow:
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1809 PyErr_SetString(PyExc_OverflowError,
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1810 "float too large to pack with f format");
354e377c9590 Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently Mark Dickinson <dickinsm@gmail.com> parents: 45381 diff changeset	1811 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	1812 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1813
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1814 int
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1815 _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	1816 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1817 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1818 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1819 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1820 double f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1821 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1822 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1823
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1824 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1825 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1826 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1827 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1828
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1829 if (x < 0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1830 sign = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1831 x = -x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1832 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1833 else
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1834 sign = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1835
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1836 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	1837
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1838 /* Normalize f to be in the range [1.0, 2.0) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1839 if (0.5 <= f && f < 1.0) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1840 f *= 2.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1841 e--;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1842 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1843 else if (f == 0.0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1844 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1845 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1846 PyErr_SetString(PyExc_SystemError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1847 "frexp() result out of range");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1848 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1849 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1850
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1851 if (e >= 1024)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1852 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1853 else if (e < -1022) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1854 /* Gradual underflow */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1855 f = ldexp(f, 1022 + e);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1856 e = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1857 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1858 else if (!(e == 0 && f == 0.0)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1859 e += 1023;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1860 f -= 1.0; /* Get rid of leading 1 */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1861 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1862
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1863 /* fhi receives the high 28 bits; flo the low 24 bits (== 52 bits) */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1864 f = 268435456.0; / 2*28 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1865 fhi = (unsigned int)f; /* Truncate */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1866 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	1867
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1868 f -= (double)fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1869 f = 16777216.0; / 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1870 flo = (unsigned int)(f + 0.5); /* Round */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1871 assert(flo <= 16777216);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1872 if (flo >> 24) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1873 /* The carry propagated out of a string of 24 1 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1874 flo = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1875 ++fhi;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1876 if (fhi >> 28) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1877 /* And it also progagated out of the next 28 bits. */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1878 fhi = 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1879 ++e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1880 if (e >= 2047)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1881 goto Overflow;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1882 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1883 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1884
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1885 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1886 *p = (sign << 7) \| (e >> 4);
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1887 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1888
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1889 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1890 *p = (unsigned char) (((e & 0xF) << 4) \| (fhi >> 24));
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1891 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	1892
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1893 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1894 *p = (fhi >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1895 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1896
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1897 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1898 *p = (fhi >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1899 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1900
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1901 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1902 *p = fhi & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1903 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1904
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1905 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1906 *p = (flo >> 16) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1907 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1908
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1909 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1910 *p = (flo >> 8) & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1911 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1912
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1913 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1914 *p = flo & 0xFF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1915 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1916
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1917 /* Done */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1918 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1919
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1920 Overflow:
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1921 PyErr_SetString(PyExc_OverflowError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1922 "float too large to pack with d format");
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1923 return -1;
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1924 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1925 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1926 const char s = (char)&x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1927 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	1928
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1929 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1930 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1931 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1932 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1933 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1934
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1935 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1936 p = s++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1937 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1938 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1939 return 0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1940 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1941 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1942
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1943 double
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1944 _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	1945 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1946 if (float_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1947 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1948 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1949 unsigned int f;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1950 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1951 int incr = 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1952
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1953 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1954 p += 3;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1955 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1956 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1957
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1958 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1959 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1960 e = (*p & 0x7F) << 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1961 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	1962
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1963 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1964 e \|= (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1965 f = (*p & 0x7F) << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1966 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	1967
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1968 if (e == 255) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1969 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1970 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1971 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1972 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1973 return -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1974 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1975
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1976 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1977 f \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1978 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	1979
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1980 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1981 f \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1982
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1983 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	1984
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1985 /* XXX This sadly ignores Inf/NaN issues */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1986 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1987 e = -126;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1988 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1989 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1990 e -= 127;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1991 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1992 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	1993
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1994 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1995 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	1996
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1997 return x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	1998 }
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	1999 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2000 float x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2001
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2002 if ((float_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2003 \|\| (float_format == ieee_big_endian_format && le)) {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2004 char buf[4];
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2005 char *d = &buf[3];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2006 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	2007
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2008 for (i = 0; i < 4; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2009 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2010 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2011 memcpy(&x, buf, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2012 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2013 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2014 memcpy(&x, p, 4);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2015 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2016
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2017 return x;
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2018 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2019 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2020
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2021 double
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2022 _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	2023 {
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2024 if (double_format == unknown_format) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2025 unsigned char sign;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2026 int e;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2027 unsigned int fhi, flo;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2028 double x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2029 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	2030
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2031 if (le) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2032 p += 7;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2033 incr = -1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2034 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2035
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2036 /* First byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2037 sign = (*p >> 7) & 1;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2038 e = (*p & 0x7F) << 4;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2039
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2040 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	2041
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2042 /* Second byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2043 e \|= (*p >> 4) & 0xF;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2044 fhi = (*p & 0xF) << 24;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2045 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	2046
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2047 if (e == 2047) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2048 PyErr_SetString(
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2049 PyExc_ValueError,
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2050 "can't unpack IEEE 754 special value "
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2051 "on non-IEEE platform");
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2052 return -1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2053 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2054
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2055 /* Third byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2056 fhi \|= *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2057 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	2058
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2059 /* Fourth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2060 fhi \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2061 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2062
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2063 /* Fifth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2064 fhi \|= *p;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2065 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	2066
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2067 /* Sixth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2068 flo = *p << 16;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2069 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2070
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2071 /* Seventh byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2072 flo \|= *p << 8;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2073 p += incr;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2074
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2075 /* Eighth byte */
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2076 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	2077
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2078 x = (double)fhi + (double)flo / 16777216.0; /* 2*24 /
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2079 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	2080
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2081 if (e == 0)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2082 e = -1022;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2083 else {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2084 x += 1.0;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2085 e -= 1023;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2086 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2087 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	2088
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2089 if (sign)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2090 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	2091
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2092 return x;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2093 }
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2094 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2095 double x;
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2096
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2097 if ((double_format == ieee_little_endian_format && !le)
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2098 \|\| (double_format == ieee_big_endian_format && le)) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2099 char buf[8];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2100 char *d = &buf[7];
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2101 int i;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2102
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2103 for (i = 0; i < 8; i++) {
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2104 d-- = p++;
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2105 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2106 memcpy(&x, buf, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2107 }
1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2108 else {
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2109 memcpy(&x, p, 8);
34972 1dd8a0d64432 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34931 diff changeset	2110 }
35987 8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2111
8eda1a58a490 Fix bug Michael W. Hudson <mwh@python.net> parents: 35178 diff changeset	2112 return x;
28335 70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2113 }
70003b0cb837 New private API functions _PyFloat_{Pack,Unpack}(4,8}. This is a Tim Peters <tim.peters@gmail.com> parents: 27521 diff changeset	2114 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/floatobject.c @ 47787:b32101c19bf8 legacy-trunk