Guido van Rossum | f70e43a | 1991-02-19 12:39:46 +0000 | [diff] [blame] | 1 | |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 2 | /* Float object implementation */ |
| 3 | |
Guido van Rossum | 2a9096b | 1990-10-21 22:15:08 +0000 | [diff] [blame] | 4 | /* XXX There should be overflow checks here, but it's hard to check |
| 5 | for any kind of float exception without losing portability. */ |
| 6 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 7 | #include "Python.h" |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 8 | |
Guido van Rossum | 3f5da24 | 1990-12-20 15:06:42 +0000 | [diff] [blame] | 9 | #include <ctype.h> |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 10 | |
Guido van Rossum | 9575a44 | 1993-04-07 14:06:14 +0000 | [diff] [blame] | 11 | #ifdef i860 |
| 12 | /* Cray APP has bogus definition of HUGE_VAL in <math.h> */ |
| 13 | #undef HUGE_VAL |
| 14 | #endif |
| 15 | |
Guido van Rossum | 9d81b55 | 1996-06-26 18:27:19 +0000 | [diff] [blame] | 16 | #if defined(HUGE_VAL) && !defined(CHECK) |
Guido van Rossum | 7fa52f8 | 1991-12-16 15:43:14 +0000 | [diff] [blame] | 17 | #define CHECK(x) if (errno != 0) ; \ |
| 18 | else if (-HUGE_VAL <= (x) && (x) <= HUGE_VAL) ; \ |
| 19 | else errno = ERANGE |
Guido van Rossum | 9d81b55 | 1996-06-26 18:27:19 +0000 | [diff] [blame] | 20 | #endif |
| 21 | |
| 22 | #ifndef CHECK |
Guido van Rossum | 7fa52f8 | 1991-12-16 15:43:14 +0000 | [diff] [blame] | 23 | #define CHECK(x) /* Don't know how to check */ |
| 24 | #endif |
| 25 | |
Guido van Rossum | 07e3a7e | 1995-02-27 10:13:37 +0000 | [diff] [blame] | 26 | #if !defined(__STDC__) && !defined(macintosh) |
Tim Peters | dbd9ba6 | 2000-07-09 03:09:57 +0000 | [diff] [blame] | 27 | extern double fmod(double, double); |
| 28 | extern double pow(double, double); |
Guido van Rossum | 6923e13 | 1990-11-02 17:50:43 +0000 | [diff] [blame] | 29 | #endif |
| 30 | |
Martin v. Löwis | 01c6526 | 2001-03-06 12:14:54 +0000 | [diff] [blame] | 31 | #if defined(sun) && !defined(__SVR4) |
Guido van Rossum | 3c03fa8 | 1997-10-31 17:00:30 +0000 | [diff] [blame] | 32 | /* On SunOS4.1 only libm.a exists. Make sure that references to all |
| 33 | needed math functions exist in the executable, so that dynamic |
| 34 | loading of mathmodule does not fail. */ |
| 35 | double (*_Py_math_funcs_hack[])() = { |
| 36 | acos, asin, atan, atan2, ceil, cos, cosh, exp, fabs, floor, |
| 37 | fmod, log, log10, pow, sin, sinh, sqrt, tan, tanh |
| 38 | }; |
| 39 | #endif |
| 40 | |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 41 | /* Special free list -- see comments for same code in intobject.c. */ |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 42 | #define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */ |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 43 | #define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */ |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 44 | #define N_FLOATOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyFloatObject)) |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 45 | |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 46 | struct _floatblock { |
| 47 | struct _floatblock *next; |
| 48 | PyFloatObject objects[N_FLOATOBJECTS]; |
| 49 | }; |
| 50 | |
| 51 | typedef struct _floatblock PyFloatBlock; |
| 52 | |
| 53 | static PyFloatBlock *block_list = NULL; |
| 54 | static PyFloatObject *free_list = NULL; |
| 55 | |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 56 | static PyFloatObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 57 | fill_free_list(void) |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 58 | { |
| 59 | PyFloatObject *p, *q; |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 60 | /* XXX Float blocks escape the object heap. Use PyObject_MALLOC ??? */ |
| 61 | p = (PyFloatObject *) PyMem_MALLOC(sizeof(PyFloatBlock)); |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 62 | if (p == NULL) |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 63 | return (PyFloatObject *) PyErr_NoMemory(); |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 64 | ((PyFloatBlock *)p)->next = block_list; |
| 65 | block_list = (PyFloatBlock *)p; |
| 66 | p = &((PyFloatBlock *)p)->objects[0]; |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 67 | q = p + N_FLOATOBJECTS; |
| 68 | while (--q > p) |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 69 | q->ob_type = (struct _typeobject *)(q-1); |
| 70 | q->ob_type = NULL; |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 71 | return p + N_FLOATOBJECTS - 1; |
| 72 | } |
| 73 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 74 | PyObject * |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 75 | PyFloat_FromDouble(double fval) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 76 | { |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 77 | register PyFloatObject *op; |
| 78 | if (free_list == NULL) { |
| 79 | if ((free_list = fill_free_list()) == NULL) |
| 80 | return NULL; |
| 81 | } |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 82 | /* PyObject_New is inlined */ |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 83 | op = free_list; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 84 | free_list = (PyFloatObject *)op->ob_type; |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 85 | PyObject_INIT(op, &PyFloat_Type); |
Guido van Rossum | 2a9096b | 1990-10-21 22:15:08 +0000 | [diff] [blame] | 86 | op->ob_fval = fval; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 87 | return (PyObject *) op; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 88 | } |
| 89 | |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 90 | /************************************************************************** |
| 91 | RED_FLAG 22-Sep-2000 tim |
| 92 | PyFloat_FromString's pend argument is braindead. Prior to this RED_FLAG, |
| 93 | |
| 94 | 1. If v was a regular string, *pend was set to point to its terminating |
| 95 | null byte. That's useless (the caller can find that without any |
| 96 | help from this function!). |
| 97 | |
| 98 | 2. If v was a Unicode string, or an object convertible to a character |
| 99 | buffer, *pend was set to point into stack trash (the auto temp |
| 100 | vector holding the character buffer). That was downright dangerous. |
| 101 | |
| 102 | Since we can't change the interface of a public API function, pend is |
| 103 | still supported but now *officially* useless: if pend is not NULL, |
| 104 | *pend is set to NULL. |
| 105 | **************************************************************************/ |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 106 | PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 107 | PyFloat_FromString(PyObject *v, char **pend) |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 108 | { |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 109 | const char *s, *last, *end; |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 110 | double x; |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 111 | char buffer[256]; /* for errors */ |
Martin v. Löwis | 339d0f7 | 2001-08-17 18:39:25 +0000 | [diff] [blame] | 112 | #ifdef Py_USING_UNICODE |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 113 | char s_buffer[256]; /* for objects convertible to a char buffer */ |
Martin v. Löwis | 339d0f7 | 2001-08-17 18:39:25 +0000 | [diff] [blame] | 114 | #endif |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 115 | int len; |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 116 | |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 117 | if (pend) |
| 118 | *pend = NULL; |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 119 | if (PyString_Check(v)) { |
| 120 | s = PyString_AS_STRING(v); |
| 121 | len = PyString_GET_SIZE(v); |
| 122 | } |
Martin v. Löwis | 339d0f7 | 2001-08-17 18:39:25 +0000 | [diff] [blame] | 123 | #ifdef Py_USING_UNICODE |
Guido van Rossum | 9e896b3 | 2000-04-05 20:11:21 +0000 | [diff] [blame] | 124 | else if (PyUnicode_Check(v)) { |
Guido van Rossum | 9e896b3 | 2000-04-05 20:11:21 +0000 | [diff] [blame] | 125 | if (PyUnicode_GET_SIZE(v) >= sizeof(s_buffer)) { |
| 126 | PyErr_SetString(PyExc_ValueError, |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 127 | "Unicode float() literal too long to convert"); |
Guido van Rossum | 9e896b3 | 2000-04-05 20:11:21 +0000 | [diff] [blame] | 128 | return NULL; |
| 129 | } |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 130 | if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v), |
Guido van Rossum | 9e896b3 | 2000-04-05 20:11:21 +0000 | [diff] [blame] | 131 | PyUnicode_GET_SIZE(v), |
| 132 | s_buffer, |
| 133 | NULL)) |
| 134 | return NULL; |
| 135 | s = s_buffer; |
Trent Mick | a248fb6 | 2000-08-12 21:37:39 +0000 | [diff] [blame] | 136 | len = (int)strlen(s); |
Guido van Rossum | 9e896b3 | 2000-04-05 20:11:21 +0000 | [diff] [blame] | 137 | } |
Martin v. Löwis | 339d0f7 | 2001-08-17 18:39:25 +0000 | [diff] [blame] | 138 | #endif |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 139 | else if (PyObject_AsCharBuffer(v, &s, &len)) { |
| 140 | PyErr_SetString(PyExc_TypeError, |
| 141 | "float() needs a string argument"); |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 142 | return NULL; |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 143 | } |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 144 | |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 145 | last = s + len; |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 146 | while (*s && isspace(Py_CHARMASK(*s))) |
| 147 | s++; |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 148 | if (*s == '\0') { |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 149 | PyErr_SetString(PyExc_ValueError, "empty string for float()"); |
| 150 | return NULL; |
| 151 | } |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 152 | /* We don't care about overflow or underflow. If the platform supports |
| 153 | * them, infinities and signed zeroes (on underflow) are fine. |
| 154 | * However, strtod can return 0 for denormalized numbers, where atof |
| 155 | * does not. So (alas!) we special-case a zero result. Note that |
| 156 | * whether strtod sets errno on underflow is not defined, so we can't |
| 157 | * key off errno. |
| 158 | */ |
Tim Peters | 858346e | 2000-09-25 21:01:28 +0000 | [diff] [blame] | 159 | PyFPE_START_PROTECT("strtod", return NULL) |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 160 | x = strtod(s, (char **)&end); |
Tim Peters | 858346e | 2000-09-25 21:01:28 +0000 | [diff] [blame] | 161 | PyFPE_END_PROTECT(x) |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 162 | errno = 0; |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 163 | /* Believe it or not, Solaris 2.6 can move end *beyond* the null |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 164 | byte at the end of the string, when the input is inf(inity). */ |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 165 | if (end > last) |
| 166 | end = last; |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 167 | if (end == s) { |
| 168 | sprintf(buffer, "invalid literal for float(): %.200s", s); |
| 169 | PyErr_SetString(PyExc_ValueError, buffer); |
| 170 | return NULL; |
| 171 | } |
| 172 | /* Since end != s, the platform made *some* kind of sense out |
| 173 | of the input. Trust it. */ |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 174 | while (*end && isspace(Py_CHARMASK(*end))) |
| 175 | end++; |
| 176 | if (*end != '\0') { |
| 177 | sprintf(buffer, "invalid literal for float(): %.200s", s); |
| 178 | PyErr_SetString(PyExc_ValueError, buffer); |
| 179 | return NULL; |
| 180 | } |
Guido van Rossum | 4c08d55 | 2000-03-10 22:55:18 +0000 | [diff] [blame] | 181 | else if (end != last) { |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 182 | PyErr_SetString(PyExc_ValueError, |
| 183 | "null byte in argument for float()"); |
| 184 | return NULL; |
| 185 | } |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 186 | if (x == 0.0) { |
| 187 | /* See above -- may have been strtod being anal |
| 188 | about denorms. */ |
Tim Peters | 858346e | 2000-09-25 21:01:28 +0000 | [diff] [blame] | 189 | PyFPE_START_PROTECT("atof", return NULL) |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 190 | x = atof(s); |
Tim Peters | 858346e | 2000-09-25 21:01:28 +0000 | [diff] [blame] | 191 | PyFPE_END_PROTECT(x) |
Tim Peters | ef14d73 | 2000-09-23 03:39:17 +0000 | [diff] [blame] | 192 | errno = 0; /* whether atof ever set errno is undefined */ |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 193 | } |
Barry Warsaw | 226ae6c | 1999-10-12 19:54:53 +0000 | [diff] [blame] | 194 | return PyFloat_FromDouble(x); |
| 195 | } |
| 196 | |
Guido van Rossum | 234f942 | 1993-06-17 12:35:49 +0000 | [diff] [blame] | 197 | static void |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 198 | float_dealloc(PyFloatObject *op) |
Guido van Rossum | 3132a5a | 1992-03-27 17:28:44 +0000 | [diff] [blame] | 199 | { |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 200 | op->ob_type = (struct _typeobject *)free_list; |
Guido van Rossum | 93ad0df | 1997-05-13 21:00:42 +0000 | [diff] [blame] | 201 | free_list = op; |
Guido van Rossum | 3132a5a | 1992-03-27 17:28:44 +0000 | [diff] [blame] | 202 | } |
| 203 | |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 204 | double |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 205 | PyFloat_AsDouble(PyObject *op) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 206 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 207 | PyNumberMethods *nb; |
| 208 | PyFloatObject *fo; |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 209 | double val; |
| 210 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 211 | if (op && PyFloat_Check(op)) |
| 212 | return PyFloat_AS_DOUBLE((PyFloatObject*) op); |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 213 | |
| 214 | if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL || |
| 215 | nb->nb_float == NULL) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 216 | PyErr_BadArgument(); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 217 | return -1; |
| 218 | } |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 219 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 220 | fo = (PyFloatObject*) (*nb->nb_float) (op); |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 221 | if (fo == NULL) |
| 222 | return -1; |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 223 | if (!PyFloat_Check(fo)) { |
| 224 | PyErr_SetString(PyExc_TypeError, |
| 225 | "nb_float should return float object"); |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 226 | return -1; |
| 227 | } |
| 228 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 229 | val = PyFloat_AS_DOUBLE(fo); |
| 230 | Py_DECREF(fo); |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 231 | |
| 232 | return val; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 233 | } |
| 234 | |
| 235 | /* Methods */ |
| 236 | |
Guido van Rossum | 27dec7e | 1991-06-04 19:42:53 +0000 | [diff] [blame] | 237 | void |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 238 | PyFloat_AsStringEx(char *buf, PyFloatObject *v, int precision) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 239 | { |
| 240 | register char *cp; |
| 241 | /* Subroutine for float_repr and float_print. |
| 242 | We want float numbers to be recognizable as such, |
| 243 | i.e., they should contain a decimal point or an exponent. |
| 244 | However, %g may print the number as an integer; |
| 245 | in such cases, we append ".0" to the string. */ |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 246 | sprintf(buf, "%.*g", precision, v->ob_fval); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 247 | cp = buf; |
| 248 | if (*cp == '-') |
| 249 | cp++; |
| 250 | for (; *cp != '\0'; cp++) { |
| 251 | /* Any non-digit means it's not an integer; |
| 252 | this takes care of NAN and INF as well. */ |
Guido van Rossum | 9fa2c11 | 1995-02-10 17:00:37 +0000 | [diff] [blame] | 253 | if (!isdigit(Py_CHARMASK(*cp))) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 254 | break; |
| 255 | } |
| 256 | if (*cp == '\0') { |
| 257 | *cp++ = '.'; |
| 258 | *cp++ = '0'; |
| 259 | *cp++ = '\0'; |
| 260 | } |
| 261 | } |
| 262 | |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 263 | /* Macro and helper that convert PyObject obj to a C double and store |
| 264 | the value in dbl; this replaces the functionality of the coercion |
| 265 | slot function */ |
| 266 | |
| 267 | #define CONVERT_TO_DOUBLE(obj, dbl) \ |
| 268 | if (PyFloat_Check(obj)) \ |
| 269 | dbl = PyFloat_AS_DOUBLE(obj); \ |
| 270 | else if (convert_to_double(&(obj), &(dbl)) < 0) \ |
| 271 | return obj; |
| 272 | |
| 273 | static int |
Tim Peters | 9fffa3e | 2001-09-04 05:14:19 +0000 | [diff] [blame] | 274 | convert_to_double(PyObject **v, double *dbl) |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 275 | { |
| 276 | register PyObject *obj = *v; |
Tim Peters | 9fffa3e | 2001-09-04 05:14:19 +0000 | [diff] [blame] | 277 | |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 278 | if (PyInt_Check(obj)) { |
| 279 | *dbl = (double)PyInt_AS_LONG(obj); |
| 280 | } |
| 281 | else if (PyLong_Check(obj)) { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 282 | *dbl = PyLong_AsDouble(obj); |
Tim Peters | 9fffa3e | 2001-09-04 05:14:19 +0000 | [diff] [blame] | 283 | if (*dbl == -1.0 && PyErr_Occurred()) { |
| 284 | *v = NULL; |
| 285 | return -1; |
| 286 | } |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 287 | } |
| 288 | else { |
| 289 | Py_INCREF(Py_NotImplemented); |
| 290 | *v = Py_NotImplemented; |
| 291 | return -1; |
| 292 | } |
| 293 | return 0; |
| 294 | } |
| 295 | |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 296 | /* Precisions used by repr() and str(), respectively. |
| 297 | |
| 298 | The repr() precision (17 significant decimal digits) is the minimal number |
| 299 | that is guaranteed to have enough precision so that if the number is read |
| 300 | back in the exact same binary value is recreated. This is true for IEEE |
| 301 | floating point by design, and also happens to work for all other modern |
| 302 | hardware. |
| 303 | |
| 304 | The str() precision is chosen so that in most cases, the rounding noise |
| 305 | created by various operations is suppressed, while giving plenty of |
| 306 | precision for practical use. |
| 307 | |
| 308 | */ |
| 309 | |
| 310 | #define PREC_REPR 17 |
| 311 | #define PREC_STR 12 |
| 312 | |
| 313 | void |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 314 | PyFloat_AsString(char *buf, PyFloatObject *v) |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 315 | { |
| 316 | PyFloat_AsStringEx(buf, v, PREC_STR); |
| 317 | } |
| 318 | |
Tim Peters | 72f98e9 | 2001-05-08 15:19:57 +0000 | [diff] [blame] | 319 | void |
| 320 | PyFloat_AsReprString(char *buf, PyFloatObject *v) |
| 321 | { |
| 322 | PyFloat_AsStringEx(buf, v, PREC_REPR); |
| 323 | } |
| 324 | |
Guido van Rossum | 3132a5a | 1992-03-27 17:28:44 +0000 | [diff] [blame] | 325 | /* ARGSUSED */ |
Guido van Rossum | 9093361 | 1991-06-07 16:10:43 +0000 | [diff] [blame] | 326 | static int |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 327 | float_print(PyFloatObject *v, FILE *fp, int flags) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 328 | { |
| 329 | char buf[100]; |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 330 | PyFloat_AsStringEx(buf, v, flags&Py_PRINT_RAW ? PREC_STR : PREC_REPR); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 331 | fputs(buf, fp); |
Guido van Rossum | 9093361 | 1991-06-07 16:10:43 +0000 | [diff] [blame] | 332 | return 0; |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 333 | } |
| 334 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 335 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 336 | float_repr(PyFloatObject *v) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 337 | { |
| 338 | char buf[100]; |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 339 | PyFloat_AsStringEx(buf, v, PREC_REPR); |
| 340 | return PyString_FromString(buf); |
| 341 | } |
| 342 | |
| 343 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 344 | float_str(PyFloatObject *v) |
Guido van Rossum | 57072eb | 1999-12-23 19:00:28 +0000 | [diff] [blame] | 345 | { |
| 346 | char buf[100]; |
| 347 | PyFloat_AsStringEx(buf, v, PREC_STR); |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 348 | return PyString_FromString(buf); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 349 | } |
| 350 | |
| 351 | static int |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 352 | float_compare(PyFloatObject *v, PyFloatObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 353 | { |
| 354 | double i = v->ob_fval; |
| 355 | double j = w->ob_fval; |
| 356 | return (i < j) ? -1 : (i > j) ? 1 : 0; |
| 357 | } |
| 358 | |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 359 | static long |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 360 | float_hash(PyFloatObject *v) |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 361 | { |
Tim Peters | 39dce29 | 2000-08-15 03:34:48 +0000 | [diff] [blame] | 362 | return _Py_HashDouble(v->ob_fval); |
Guido van Rossum | 9bfef44 | 1993-03-29 10:43:31 +0000 | [diff] [blame] | 363 | } |
| 364 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 365 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 366 | float_add(PyObject *v, PyObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 367 | { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 368 | double a,b; |
| 369 | CONVERT_TO_DOUBLE(v, a); |
| 370 | CONVERT_TO_DOUBLE(w, b); |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 371 | PyFPE_START_PROTECT("add", return 0) |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 372 | a = a + b; |
| 373 | PyFPE_END_PROTECT(a) |
| 374 | return PyFloat_FromDouble(a); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 375 | } |
| 376 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 377 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 378 | float_sub(PyObject *v, PyObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 379 | { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 380 | double a,b; |
| 381 | CONVERT_TO_DOUBLE(v, a); |
| 382 | CONVERT_TO_DOUBLE(w, b); |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 383 | PyFPE_START_PROTECT("subtract", return 0) |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 384 | a = a - b; |
| 385 | PyFPE_END_PROTECT(a) |
| 386 | return PyFloat_FromDouble(a); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 387 | } |
| 388 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 389 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 390 | float_mul(PyObject *v, PyObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 391 | { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 392 | double a,b; |
| 393 | CONVERT_TO_DOUBLE(v, a); |
| 394 | CONVERT_TO_DOUBLE(w, b); |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 395 | PyFPE_START_PROTECT("multiply", return 0) |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 396 | a = a * b; |
| 397 | PyFPE_END_PROTECT(a) |
| 398 | return PyFloat_FromDouble(a); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 399 | } |
| 400 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 401 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 402 | float_div(PyObject *v, PyObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 403 | { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 404 | double a,b; |
| 405 | CONVERT_TO_DOUBLE(v, a); |
| 406 | CONVERT_TO_DOUBLE(w, b); |
| 407 | if (b == 0.0) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 408 | PyErr_SetString(PyExc_ZeroDivisionError, "float division"); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 409 | return NULL; |
| 410 | } |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 411 | PyFPE_START_PROTECT("divide", return 0) |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 412 | a = a / b; |
| 413 | PyFPE_END_PROTECT(a) |
| 414 | return PyFloat_FromDouble(a); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 415 | } |
| 416 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 417 | static PyObject * |
Guido van Rossum | 393661d | 2001-08-31 17:40:15 +0000 | [diff] [blame] | 418 | float_classic_div(PyObject *v, PyObject *w) |
| 419 | { |
| 420 | double a,b; |
| 421 | CONVERT_TO_DOUBLE(v, a); |
| 422 | CONVERT_TO_DOUBLE(w, b); |
Guido van Rossum | 1832de4 | 2001-09-04 03:51:09 +0000 | [diff] [blame] | 423 | if (Py_DivisionWarningFlag >= 2 && |
Guido van Rossum | 393661d | 2001-08-31 17:40:15 +0000 | [diff] [blame] | 424 | PyErr_Warn(PyExc_DeprecationWarning, "classic float division") < 0) |
| 425 | return NULL; |
| 426 | if (b == 0.0) { |
| 427 | PyErr_SetString(PyExc_ZeroDivisionError, "float division"); |
| 428 | return NULL; |
| 429 | } |
| 430 | PyFPE_START_PROTECT("divide", return 0) |
| 431 | a = a / b; |
| 432 | PyFPE_END_PROTECT(a) |
| 433 | return PyFloat_FromDouble(a); |
| 434 | } |
| 435 | |
| 436 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 437 | float_rem(PyObject *v, PyObject *w) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 438 | { |
Guido van Rossum | 56cd67a | 1992-01-26 18:16:35 +0000 | [diff] [blame] | 439 | double vx, wx; |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 440 | double mod; |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 441 | CONVERT_TO_DOUBLE(v, vx); |
| 442 | CONVERT_TO_DOUBLE(w, wx); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 443 | if (wx == 0.0) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 444 | PyErr_SetString(PyExc_ZeroDivisionError, "float modulo"); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 445 | return NULL; |
| 446 | } |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 447 | PyFPE_START_PROTECT("modulo", return 0) |
Guido van Rossum | 56cd67a | 1992-01-26 18:16:35 +0000 | [diff] [blame] | 448 | mod = fmod(vx, wx); |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 449 | /* note: checking mod*wx < 0 is incorrect -- underflows to |
| 450 | 0 if wx < sqrt(smallest nonzero double) */ |
| 451 | if (mod && ((wx < 0) != (mod < 0))) { |
Guido van Rossum | 56cd67a | 1992-01-26 18:16:35 +0000 | [diff] [blame] | 452 | mod += wx; |
Guido van Rossum | 56cd67a | 1992-01-26 18:16:35 +0000 | [diff] [blame] | 453 | } |
Guido van Rossum | 45b8391 | 1997-03-14 04:32:50 +0000 | [diff] [blame] | 454 | PyFPE_END_PROTECT(mod) |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 455 | return PyFloat_FromDouble(mod); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 456 | } |
| 457 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 458 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 459 | float_divmod(PyObject *v, PyObject *w) |
Guido van Rossum | eba1b5e | 1991-05-05 20:07:00 +0000 | [diff] [blame] | 460 | { |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 461 | double vx, wx; |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 462 | double div, mod, floordiv; |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 463 | CONVERT_TO_DOUBLE(v, vx); |
| 464 | CONVERT_TO_DOUBLE(w, wx); |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 465 | if (wx == 0.0) { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 466 | PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()"); |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 467 | return NULL; |
| 468 | } |
Guido van Rossum | 09e6ad0 | 1997-02-14 22:54:21 +0000 | [diff] [blame] | 469 | PyFPE_START_PROTECT("divmod", return 0) |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 470 | mod = fmod(vx, wx); |
Tim Peters | 78fc0b5 | 2000-09-16 03:54:24 +0000 | [diff] [blame] | 471 | /* fmod is typically exact, so vx-mod is *mathematically* an |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 472 | exact multiple of wx. But this is fp arithmetic, and fp |
| 473 | vx - mod is an approximation; the result is that div may |
| 474 | not be an exact integral value after the division, although |
| 475 | it will always be very close to one. |
| 476 | */ |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 477 | div = (vx - mod) / wx; |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 478 | /* note: checking mod*wx < 0 is incorrect -- underflows to |
| 479 | 0 if wx < sqrt(smallest nonzero double) */ |
| 480 | if (mod && ((wx < 0) != (mod < 0))) { |
Guido van Rossum | 15ecff4 | 1991-10-20 20:16:45 +0000 | [diff] [blame] | 481 | mod += wx; |
| 482 | div -= 1.0; |
| 483 | } |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 484 | /* snap quotient to nearest integral value */ |
| 485 | floordiv = floor(div); |
| 486 | if (div - floordiv > 0.5) |
| 487 | floordiv += 1.0; |
Guido van Rossum | 45b8391 | 1997-03-14 04:32:50 +0000 | [diff] [blame] | 488 | PyFPE_END_PROTECT(div) |
Guido van Rossum | 9263e78 | 1999-05-06 14:26:34 +0000 | [diff] [blame] | 489 | return Py_BuildValue("(dd)", floordiv, mod); |
Guido van Rossum | eba1b5e | 1991-05-05 20:07:00 +0000 | [diff] [blame] | 490 | } |
| 491 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 492 | static PyObject * |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 493 | float_pow(PyObject *v, PyObject *w, PyObject *z) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 494 | { |
| 495 | double iv, iw, ix; |
Tim Peters | 32f453e | 2001-09-03 08:35:41 +0000 | [diff] [blame] | 496 | |
| 497 | if ((PyObject *)z != Py_None) { |
Tim Peters | 4c483c4 | 2001-09-05 06:24:58 +0000 | [diff] [blame] | 498 | PyErr_SetString(PyExc_TypeError, "pow() 3rd argument not " |
| 499 | "allowed unless all other arguments are integers"); |
Tim Peters | 32f453e | 2001-09-03 08:35:41 +0000 | [diff] [blame] | 500 | return NULL; |
| 501 | } |
| 502 | |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 503 | CONVERT_TO_DOUBLE(v, iv); |
| 504 | CONVERT_TO_DOUBLE(w, iw); |
Tim Peters | c54d190 | 2000-10-06 00:36:09 +0000 | [diff] [blame] | 505 | |
| 506 | /* Sort out special cases here instead of relying on pow() */ |
Tim Peters | 96685bf | 2001-08-23 22:31:37 +0000 | [diff] [blame] | 507 | if (iw == 0) { /* v**0 is 1, even 0**0 */ |
Tim Peters | c54d190 | 2000-10-06 00:36:09 +0000 | [diff] [blame] | 508 | PyFPE_START_PROTECT("pow", return NULL) |
| 509 | if ((PyObject *)z != Py_None) { |
Neil Schemenauer | 32117e5 | 2001-01-04 01:44:34 +0000 | [diff] [blame] | 510 | double iz; |
Neil Schemenauer | 010b0cc | 2001-01-08 06:29:50 +0000 | [diff] [blame] | 511 | CONVERT_TO_DOUBLE(z, iz); |
Tim Peters | 96685bf | 2001-08-23 22:31:37 +0000 | [diff] [blame] | 512 | ix = fmod(1.0, iz); |
| 513 | if (ix != 0 && iz < 0) |
| 514 | ix += iz; |
Guido van Rossum | 70d9346 | 1991-05-28 21:57:39 +0000 | [diff] [blame] | 515 | } |
Tim Peters | c54d190 | 2000-10-06 00:36:09 +0000 | [diff] [blame] | 516 | else |
| 517 | ix = 1.0; |
| 518 | PyFPE_END_PROTECT(ix) |
| 519 | return PyFloat_FromDouble(ix); |
| 520 | } |
Tim Peters | 96685bf | 2001-08-23 22:31:37 +0000 | [diff] [blame] | 521 | if (iv == 0.0) { /* 0**w is error if w<0, else 1 */ |
Tim Peters | c54d190 | 2000-10-06 00:36:09 +0000 | [diff] [blame] | 522 | if (iw < 0.0) { |
| 523 | PyErr_SetString(PyExc_ZeroDivisionError, |
Fred Drake | 661ea26 | 2000-10-24 19:57:45 +0000 | [diff] [blame] | 524 | "0.0 cannot be raised to a negative power"); |
Tim Peters | c54d190 | 2000-10-06 00:36:09 +0000 | [diff] [blame] | 525 | return NULL; |
| 526 | } |
| 527 | return PyFloat_FromDouble(0.0); |
| 528 | } |
Tim Peters | 96685bf | 2001-08-23 22:31:37 +0000 | [diff] [blame] | 529 | if (iv < 0.0 && iw != floor(iw)) { |
| 530 | PyErr_SetString(PyExc_ValueError, |
| 531 | "negative number cannot be raised to a fractional power"); |
| 532 | return NULL; |
Guido van Rossum | 86c04c2 | 1996-08-09 20:50:14 +0000 | [diff] [blame] | 533 | } |
Tim Peters | 96685bf | 2001-08-23 22:31:37 +0000 | [diff] [blame] | 534 | errno = 0; |
| 535 | PyFPE_START_PROTECT("pow", return NULL) |
| 536 | ix = pow(iv, iw); |
| 537 | PyFPE_END_PROTECT(ix) |
Guido van Rossum | 7fa52f8 | 1991-12-16 15:43:14 +0000 | [diff] [blame] | 538 | CHECK(ix); |
Guido van Rossum | 2a9096b | 1990-10-21 22:15:08 +0000 | [diff] [blame] | 539 | if (errno != 0) { |
| 540 | /* XXX could it be another type of error? */ |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 541 | PyErr_SetFromErrno(PyExc_OverflowError); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 542 | return NULL; |
Guido van Rossum | 2a9096b | 1990-10-21 22:15:08 +0000 | [diff] [blame] | 543 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 544 | return PyFloat_FromDouble(ix); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 545 | } |
| 546 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 547 | static PyObject * |
Guido van Rossum | 4668b00 | 2001-08-08 05:00:18 +0000 | [diff] [blame] | 548 | float_int_div(PyObject *v, PyObject *w) |
| 549 | { |
| 550 | PyObject *t, *r; |
| 551 | |
| 552 | t = float_divmod(v, w); |
| 553 | if (t != NULL) { |
| 554 | r = PyTuple_GET_ITEM(t, 0); |
| 555 | Py_INCREF(r); |
| 556 | Py_DECREF(t); |
| 557 | return r; |
| 558 | } |
| 559 | return NULL; |
| 560 | } |
| 561 | |
| 562 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 563 | float_neg(PyFloatObject *v) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 564 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 565 | return PyFloat_FromDouble(-v->ob_fval); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 566 | } |
| 567 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 568 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 569 | float_pos(PyFloatObject *v) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 570 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 571 | Py_INCREF(v); |
| 572 | return (PyObject *)v; |
Guido van Rossum | eba1b5e | 1991-05-05 20:07:00 +0000 | [diff] [blame] | 573 | } |
| 574 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 575 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 576 | float_abs(PyFloatObject *v) |
Guido van Rossum | eba1b5e | 1991-05-05 20:07:00 +0000 | [diff] [blame] | 577 | { |
| 578 | if (v->ob_fval < 0) |
| 579 | return float_neg(v); |
| 580 | else |
| 581 | return float_pos(v); |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 582 | } |
| 583 | |
Guido van Rossum | 50b4ef6 | 1991-05-14 11:57:01 +0000 | [diff] [blame] | 584 | static int |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 585 | float_nonzero(PyFloatObject *v) |
Guido van Rossum | 50b4ef6 | 1991-05-14 11:57:01 +0000 | [diff] [blame] | 586 | { |
| 587 | return v->ob_fval != 0.0; |
| 588 | } |
| 589 | |
Guido van Rossum | 234f942 | 1993-06-17 12:35:49 +0000 | [diff] [blame] | 590 | static int |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 591 | float_coerce(PyObject **pv, PyObject **pw) |
Guido van Rossum | e6eefc2 | 1992-08-14 12:06:52 +0000 | [diff] [blame] | 592 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 593 | if (PyInt_Check(*pw)) { |
| 594 | long x = PyInt_AsLong(*pw); |
| 595 | *pw = PyFloat_FromDouble((double)x); |
| 596 | Py_INCREF(*pv); |
Guido van Rossum | e6eefc2 | 1992-08-14 12:06:52 +0000 | [diff] [blame] | 597 | return 0; |
| 598 | } |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 599 | else if (PyLong_Check(*pw)) { |
| 600 | *pw = PyFloat_FromDouble(PyLong_AsDouble(*pw)); |
| 601 | Py_INCREF(*pv); |
Guido van Rossum | e6eefc2 | 1992-08-14 12:06:52 +0000 | [diff] [blame] | 602 | return 0; |
| 603 | } |
| 604 | return 1; /* Can't do it */ |
| 605 | } |
| 606 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 607 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 608 | float_int(PyObject *v) |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 609 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 610 | double x = PyFloat_AsDouble(v); |
Tim Peters | 7321ec4 | 2001-07-26 20:02:17 +0000 | [diff] [blame] | 611 | double wholepart; /* integral portion of x, rounded toward 0 */ |
| 612 | long aslong; /* (long)wholepart */ |
| 613 | |
| 614 | (void)modf(x, &wholepart); |
| 615 | /* doubles may have more bits than longs, or vice versa; and casting |
| 616 | to long may yield gibberish in either case. What really matters |
| 617 | is whether converting back to double again reproduces what we |
| 618 | started with. */ |
| 619 | aslong = (long)wholepart; |
| 620 | if ((double)aslong == wholepart) |
| 621 | return PyInt_FromLong(aslong); |
| 622 | PyErr_SetString(PyExc_OverflowError, "float too large to convert"); |
| 623 | return NULL; |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 624 | } |
| 625 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 626 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 627 | float_long(PyObject *v) |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 628 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 629 | double x = PyFloat_AsDouble(v); |
| 630 | return PyLong_FromDouble(x); |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 631 | } |
| 632 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 633 | static PyObject * |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 634 | float_float(PyObject *v) |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 635 | { |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 636 | Py_INCREF(v); |
Guido van Rossum | 1899c2e | 1992-09-12 11:09:23 +0000 | [diff] [blame] | 637 | return v; |
| 638 | } |
| 639 | |
| 640 | |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 641 | staticforward PyObject * |
| 642 | float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds); |
| 643 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 644 | static PyObject * |
| 645 | float_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
| 646 | { |
| 647 | PyObject *x = Py_False; /* Integer zero */ |
| 648 | static char *kwlist[] = {"x", 0}; |
| 649 | |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 650 | if (type != &PyFloat_Type) |
| 651 | return float_subtype_new(type, args, kwds); /* Wimp out */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 652 | if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) |
| 653 | return NULL; |
| 654 | if (PyString_Check(x)) |
| 655 | return PyFloat_FromString(x, NULL); |
| 656 | return PyNumber_Float(x); |
| 657 | } |
| 658 | |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 659 | /* Wimpy, slow approach to tp_new calls for subtypes of float: |
| 660 | first create a regular float from whatever arguments we got, |
| 661 | then allocate a subtype instance and initialize its ob_fval |
| 662 | from the regular float. The regular float is then thrown away. |
| 663 | */ |
| 664 | static PyObject * |
| 665 | float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
| 666 | { |
| 667 | PyObject *tmp, *new; |
| 668 | |
| 669 | assert(PyType_IsSubtype(type, &PyFloat_Type)); |
| 670 | tmp = float_new(&PyFloat_Type, args, kwds); |
| 671 | if (tmp == NULL) |
| 672 | return NULL; |
| 673 | assert(PyFloat_Check(tmp)); |
Guido van Rossum | d93dce1 | 2001-08-30 03:09:31 +0000 | [diff] [blame] | 674 | new = type->tp_alloc(type, 0); |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 675 | if (new == NULL) |
| 676 | return NULL; |
| 677 | ((PyFloatObject *)new)->ob_fval = ((PyFloatObject *)tmp)->ob_fval; |
| 678 | Py_DECREF(tmp); |
| 679 | return new; |
| 680 | } |
| 681 | |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 682 | static char float_doc[] = |
| 683 | "float(x) -> floating point number\n\ |
| 684 | \n\ |
| 685 | Convert a string or number to a floating point number, if possible."; |
| 686 | |
| 687 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 688 | static PyNumberMethods float_as_number = { |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 689 | (binaryfunc)float_add, /*nb_add*/ |
| 690 | (binaryfunc)float_sub, /*nb_subtract*/ |
| 691 | (binaryfunc)float_mul, /*nb_multiply*/ |
Guido van Rossum | 393661d | 2001-08-31 17:40:15 +0000 | [diff] [blame] | 692 | (binaryfunc)float_classic_div, /*nb_divide*/ |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 693 | (binaryfunc)float_rem, /*nb_remainder*/ |
| 694 | (binaryfunc)float_divmod, /*nb_divmod*/ |
Guido van Rossum | 0b7d02a | 1994-08-12 12:52:35 +0000 | [diff] [blame] | 695 | (ternaryfunc)float_pow, /*nb_power*/ |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 696 | (unaryfunc)float_neg, /*nb_negative*/ |
| 697 | (unaryfunc)float_pos, /*nb_positive*/ |
| 698 | (unaryfunc)float_abs, /*nb_absolute*/ |
| 699 | (inquiry)float_nonzero, /*nb_nonzero*/ |
Guido van Rossum | 27acb33 | 1991-10-24 14:55:28 +0000 | [diff] [blame] | 700 | 0, /*nb_invert*/ |
| 701 | 0, /*nb_lshift*/ |
| 702 | 0, /*nb_rshift*/ |
| 703 | 0, /*nb_and*/ |
| 704 | 0, /*nb_xor*/ |
| 705 | 0, /*nb_or*/ |
Guido van Rossum | b6775db | 1994-08-01 11:34:53 +0000 | [diff] [blame] | 706 | (coercion)float_coerce, /*nb_coerce*/ |
| 707 | (unaryfunc)float_int, /*nb_int*/ |
| 708 | (unaryfunc)float_long, /*nb_long*/ |
| 709 | (unaryfunc)float_float, /*nb_float*/ |
Guido van Rossum | 4668b00 | 2001-08-08 05:00:18 +0000 | [diff] [blame] | 710 | 0, /* nb_oct */ |
| 711 | 0, /* nb_hex */ |
| 712 | 0, /* nb_inplace_add */ |
| 713 | 0, /* nb_inplace_subtract */ |
| 714 | 0, /* nb_inplace_multiply */ |
| 715 | 0, /* nb_inplace_divide */ |
| 716 | 0, /* nb_inplace_remainder */ |
| 717 | 0, /* nb_inplace_power */ |
| 718 | 0, /* nb_inplace_lshift */ |
| 719 | 0, /* nb_inplace_rshift */ |
| 720 | 0, /* nb_inplace_and */ |
| 721 | 0, /* nb_inplace_xor */ |
| 722 | 0, /* nb_inplace_or */ |
| 723 | float_int_div, /* nb_floor_divide */ |
| 724 | float_div, /* nb_true_divide */ |
| 725 | 0, /* nb_inplace_floor_divide */ |
| 726 | 0, /* nb_inplace_true_divide */ |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 727 | }; |
| 728 | |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 729 | PyTypeObject PyFloat_Type = { |
| 730 | PyObject_HEAD_INIT(&PyType_Type) |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 731 | 0, |
| 732 | "float", |
Guido van Rossum | c0b618a | 1997-05-02 03:12:38 +0000 | [diff] [blame] | 733 | sizeof(PyFloatObject), |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 734 | 0, |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 735 | (destructor)float_dealloc, /* tp_dealloc */ |
| 736 | (printfunc)float_print, /* tp_print */ |
| 737 | 0, /* tp_getattr */ |
| 738 | 0, /* tp_setattr */ |
| 739 | (cmpfunc)float_compare, /* tp_compare */ |
| 740 | (reprfunc)float_repr, /* tp_repr */ |
| 741 | &float_as_number, /* tp_as_number */ |
| 742 | 0, /* tp_as_sequence */ |
| 743 | 0, /* tp_as_mapping */ |
| 744 | (hashfunc)float_hash, /* tp_hash */ |
| 745 | 0, /* tp_call */ |
| 746 | (reprfunc)float_str, /* tp_str */ |
| 747 | PyObject_GenericGetAttr, /* tp_getattro */ |
| 748 | 0, /* tp_setattro */ |
| 749 | 0, /* tp_as_buffer */ |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 750 | Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | |
| 751 | Py_TPFLAGS_BASETYPE, /* tp_flags */ |
Tim Peters | 6d6c1a3 | 2001-08-02 04:15:00 +0000 | [diff] [blame] | 752 | float_doc, /* tp_doc */ |
| 753 | 0, /* tp_traverse */ |
| 754 | 0, /* tp_clear */ |
| 755 | 0, /* tp_richcompare */ |
| 756 | 0, /* tp_weaklistoffset */ |
| 757 | 0, /* tp_iter */ |
| 758 | 0, /* tp_iternext */ |
| 759 | 0, /* tp_methods */ |
| 760 | 0, /* tp_members */ |
| 761 | 0, /* tp_getset */ |
| 762 | 0, /* tp_base */ |
| 763 | 0, /* tp_dict */ |
| 764 | 0, /* tp_descr_get */ |
| 765 | 0, /* tp_descr_set */ |
| 766 | 0, /* tp_dictoffset */ |
| 767 | 0, /* tp_init */ |
| 768 | 0, /* tp_alloc */ |
| 769 | float_new, /* tp_new */ |
Guido van Rossum | 85a5fbb | 1990-10-14 12:07:46 +0000 | [diff] [blame] | 770 | }; |
Guido van Rossum | fbbd57e | 1997-08-05 02:16:08 +0000 | [diff] [blame] | 771 | |
| 772 | void |
Fred Drake | fd99de6 | 2000-07-09 05:02:18 +0000 | [diff] [blame] | 773 | PyFloat_Fini(void) |
Guido van Rossum | fbbd57e | 1997-08-05 02:16:08 +0000 | [diff] [blame] | 774 | { |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 775 | PyFloatObject *p; |
| 776 | PyFloatBlock *list, *next; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 777 | int i; |
| 778 | int bc, bf; /* block count, number of freed blocks */ |
| 779 | int frem, fsum; /* remaining unfreed floats per block, total */ |
| 780 | |
| 781 | bc = 0; |
| 782 | bf = 0; |
| 783 | fsum = 0; |
| 784 | list = block_list; |
| 785 | block_list = NULL; |
Guido van Rossum | d7b5fb8 | 1999-03-19 20:59:40 +0000 | [diff] [blame] | 786 | free_list = NULL; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 787 | while (list != NULL) { |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 788 | bc++; |
| 789 | frem = 0; |
Guido van Rossum | d7b5fb8 | 1999-03-19 20:59:40 +0000 | [diff] [blame] | 790 | for (i = 0, p = &list->objects[0]; |
| 791 | i < N_FLOATOBJECTS; |
| 792 | i++, p++) { |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 793 | if (p->ob_type == &PyFloat_Type && p->ob_refcnt != 0) |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 794 | frem++; |
| 795 | } |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 796 | next = list->next; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 797 | if (frem) { |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 798 | list->next = block_list; |
| 799 | block_list = list; |
Guido van Rossum | d7b5fb8 | 1999-03-19 20:59:40 +0000 | [diff] [blame] | 800 | for (i = 0, p = &list->objects[0]; |
| 801 | i < N_FLOATOBJECTS; |
| 802 | i++, p++) { |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 803 | if (p->ob_type != &PyFloat_Type || |
| 804 | p->ob_refcnt == 0) { |
Guido van Rossum | d7b5fb8 | 1999-03-19 20:59:40 +0000 | [diff] [blame] | 805 | p->ob_type = (struct _typeobject *) |
| 806 | free_list; |
| 807 | free_list = p; |
| 808 | } |
| 809 | } |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 810 | } |
| 811 | else { |
Guido van Rossum | b18618d | 2000-05-03 23:44:39 +0000 | [diff] [blame] | 812 | PyMem_FREE(list); /* XXX PyObject_FREE ??? */ |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 813 | bf++; |
| 814 | } |
| 815 | fsum += frem; |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 816 | list = next; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 817 | } |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 818 | if (!Py_VerboseFlag) |
| 819 | return; |
| 820 | fprintf(stderr, "# cleanup floats"); |
| 821 | if (!fsum) { |
| 822 | fprintf(stderr, "\n"); |
| 823 | } |
| 824 | else { |
| 825 | fprintf(stderr, |
| 826 | ": %d unfreed float%s in %d out of %d block%s\n", |
| 827 | fsum, fsum == 1 ? "" : "s", |
| 828 | bc - bf, bc, bc == 1 ? "" : "s"); |
| 829 | } |
| 830 | if (Py_VerboseFlag > 1) { |
| 831 | list = block_list; |
| 832 | while (list != NULL) { |
Guido van Rossum | d7b5fb8 | 1999-03-19 20:59:40 +0000 | [diff] [blame] | 833 | for (i = 0, p = &list->objects[0]; |
| 834 | i < N_FLOATOBJECTS; |
| 835 | i++, p++) { |
Guido van Rossum | bef1417 | 2001-08-29 15:47:46 +0000 | [diff] [blame] | 836 | if (p->ob_type == &PyFloat_Type && |
| 837 | p->ob_refcnt != 0) { |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 838 | char buf[100]; |
| 839 | PyFloat_AsString(buf, p); |
| 840 | fprintf(stderr, |
Fred Drake | a44d353 | 2000-06-30 15:01:00 +0000 | [diff] [blame] | 841 | "# <float at %p, refcnt=%d, val=%s>\n", |
| 842 | p, p->ob_refcnt, buf); |
Guido van Rossum | 3fce883 | 1999-03-12 19:43:17 +0000 | [diff] [blame] | 843 | } |
| 844 | } |
| 845 | list = list->next; |
Guido van Rossum | f61bbc8 | 1999-03-12 00:12:21 +0000 | [diff] [blame] | 846 | } |
| 847 | } |
Guido van Rossum | fbbd57e | 1997-08-05 02:16:08 +0000 | [diff] [blame] | 848 | } |