1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Float object implementation */
|
|
|
|
|
1990-10-21 19:15:08 -03:00
|
|
|
/* XXX There should be overflow checks here, but it's hard to check
|
|
|
|
for any kind of float exception without losing portability. */
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
#include "Python.h"
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
#include <ctype.h>
|
1990-10-14 09:07:46 -03:00
|
|
|
|
1995-02-27 06:13:37 -04:00
|
|
|
#if !defined(__STDC__) && !defined(macintosh)
|
2000-07-09 00:09:57 -03:00
|
|
|
extern double fmod(double, double);
|
|
|
|
extern double pow(double, double);
|
1990-11-02 13:50:43 -04:00
|
|
|
#endif
|
|
|
|
|
2001-03-06 08:14:54 -04:00
|
|
|
#if defined(sun) && !defined(__SVR4)
|
1997-10-31 13:00:30 -04:00
|
|
|
/* On SunOS4.1 only libm.a exists. Make sure that references to all
|
|
|
|
needed math functions exist in the executable, so that dynamic
|
|
|
|
loading of mathmodule does not fail. */
|
|
|
|
double (*_Py_math_funcs_hack[])() = {
|
|
|
|
acos, asin, atan, atan2, ceil, cos, cosh, exp, fabs, floor,
|
|
|
|
fmod, log, log10, pow, sin, sinh, sqrt, tan, tanh
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
1997-05-13 18:00:42 -03:00
|
|
|
/* Special free list -- see comments for same code in intobject.c. */
|
|
|
|
#define BLOCK_SIZE 1000 /* 1K less typical malloc overhead */
|
1999-03-12 15:43:17 -04:00
|
|
|
#define BHEAD_SIZE 8 /* Enough for a 64-bit pointer */
|
1999-03-11 20:12:21 -04:00
|
|
|
#define N_FLOATOBJECTS ((BLOCK_SIZE - BHEAD_SIZE) / sizeof(PyFloatObject))
|
1999-03-12 15:43:17 -04:00
|
|
|
|
|
|
|
struct _floatblock {
|
|
|
|
struct _floatblock *next;
|
|
|
|
PyFloatObject objects[N_FLOATOBJECTS];
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct _floatblock PyFloatBlock;
|
|
|
|
|
|
|
|
static PyFloatBlock *block_list = NULL;
|
|
|
|
static PyFloatObject *free_list = NULL;
|
|
|
|
|
1997-05-13 18:00:42 -03:00
|
|
|
static PyFloatObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
fill_free_list(void)
|
1997-05-13 18:00:42 -03:00
|
|
|
{
|
|
|
|
PyFloatObject *p, *q;
|
2000-05-03 20:44:39 -03:00
|
|
|
/* XXX Float blocks escape the object heap. Use PyObject_MALLOC ??? */
|
|
|
|
p = (PyFloatObject *) PyMem_MALLOC(sizeof(PyFloatBlock));
|
1997-05-13 18:00:42 -03:00
|
|
|
if (p == NULL)
|
2000-05-03 20:44:39 -03:00
|
|
|
return (PyFloatObject *) PyErr_NoMemory();
|
1999-03-12 15:43:17 -04:00
|
|
|
((PyFloatBlock *)p)->next = block_list;
|
|
|
|
block_list = (PyFloatBlock *)p;
|
|
|
|
p = &((PyFloatBlock *)p)->objects[0];
|
1997-05-13 18:00:42 -03:00
|
|
|
q = p + N_FLOATOBJECTS;
|
|
|
|
while (--q > p)
|
1999-03-11 20:12:21 -04:00
|
|
|
q->ob_type = (struct _typeobject *)(q-1);
|
|
|
|
q->ob_type = NULL;
|
1997-05-13 18:00:42 -03:00
|
|
|
return p + N_FLOATOBJECTS - 1;
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
|
|
|
PyFloat_FromDouble(double fval)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-13 18:00:42 -03:00
|
|
|
register PyFloatObject *op;
|
|
|
|
if (free_list == NULL) {
|
|
|
|
if ((free_list = fill_free_list()) == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-08-19 16:26:42 -03:00
|
|
|
/* Inline PyObject_New */
|
1997-05-13 18:00:42 -03:00
|
|
|
op = free_list;
|
1999-03-11 20:12:21 -04:00
|
|
|
free_list = (PyFloatObject *)op->ob_type;
|
2000-05-03 20:44:39 -03:00
|
|
|
PyObject_INIT(op, &PyFloat_Type);
|
1990-10-21 19:15:08 -03:00
|
|
|
op->ob_fval = fval;
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *) op;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2000-09-23 00:39:17 -03:00
|
|
|
/**************************************************************************
|
|
|
|
RED_FLAG 22-Sep-2000 tim
|
|
|
|
PyFloat_FromString's pend argument is braindead. Prior to this RED_FLAG,
|
|
|
|
|
|
|
|
1. If v was a regular string, *pend was set to point to its terminating
|
|
|
|
null byte. That's useless (the caller can find that without any
|
|
|
|
help from this function!).
|
|
|
|
|
|
|
|
2. If v was a Unicode string, or an object convertible to a character
|
|
|
|
buffer, *pend was set to point into stack trash (the auto temp
|
|
|
|
vector holding the character buffer). That was downright dangerous.
|
|
|
|
|
|
|
|
Since we can't change the interface of a public API function, pend is
|
|
|
|
still supported but now *officially* useless: if pend is not NULL,
|
|
|
|
*pend is set to NULL.
|
|
|
|
**************************************************************************/
|
1999-10-12 16:54:53 -03:00
|
|
|
PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
PyFloat_FromString(PyObject *v, char **pend)
|
1999-10-12 16:54:53 -03:00
|
|
|
{
|
2000-03-10 18:55:18 -04:00
|
|
|
const char *s, *last, *end;
|
1999-10-12 16:54:53 -03:00
|
|
|
double x;
|
2000-09-23 00:39:17 -03:00
|
|
|
char buffer[256]; /* for errors */
|
2001-08-17 15:39:25 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2000-09-23 00:39:17 -03:00
|
|
|
char s_buffer[256]; /* for objects convertible to a char buffer */
|
2001-08-17 15:39:25 -03:00
|
|
|
#endif
|
2000-03-10 18:55:18 -04:00
|
|
|
int len;
|
1999-10-12 16:54:53 -03:00
|
|
|
|
2000-09-23 00:39:17 -03:00
|
|
|
if (pend)
|
|
|
|
*pend = NULL;
|
2000-03-10 18:55:18 -04:00
|
|
|
if (PyString_Check(v)) {
|
|
|
|
s = PyString_AS_STRING(v);
|
|
|
|
len = PyString_GET_SIZE(v);
|
|
|
|
}
|
2001-08-17 15:39:25 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2000-04-05 17:11:21 -03:00
|
|
|
else if (PyUnicode_Check(v)) {
|
|
|
|
if (PyUnicode_GET_SIZE(v) >= sizeof(s_buffer)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
2000-09-23 00:39:17 -03:00
|
|
|
"Unicode float() literal too long to convert");
|
2000-04-05 17:11:21 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2000-09-23 00:39:17 -03:00
|
|
|
if (PyUnicode_EncodeDecimal(PyUnicode_AS_UNICODE(v),
|
2000-04-05 17:11:21 -03:00
|
|
|
PyUnicode_GET_SIZE(v),
|
2001-11-01 16:09:42 -04:00
|
|
|
s_buffer,
|
2000-04-05 17:11:21 -03:00
|
|
|
NULL))
|
|
|
|
return NULL;
|
|
|
|
s = s_buffer;
|
2000-08-12 18:37:39 -03:00
|
|
|
len = (int)strlen(s);
|
2000-04-05 17:11:21 -03:00
|
|
|
}
|
2001-08-17 15:39:25 -03:00
|
|
|
#endif
|
2000-03-10 18:55:18 -04:00
|
|
|
else if (PyObject_AsCharBuffer(v, &s, &len)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
2002-05-02 10:03:22 -03:00
|
|
|
"float() argument must be a string or a number");
|
1999-10-12 16:54:53 -03:00
|
|
|
return NULL;
|
2000-03-10 18:55:18 -04:00
|
|
|
}
|
1999-10-12 16:54:53 -03:00
|
|
|
|
2000-03-10 18:55:18 -04:00
|
|
|
last = s + len;
|
1999-10-12 16:54:53 -03:00
|
|
|
while (*s && isspace(Py_CHARMASK(*s)))
|
|
|
|
s++;
|
2000-09-23 00:39:17 -03:00
|
|
|
if (*s == '\0') {
|
1999-10-12 16:54:53 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, "empty string for float()");
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-09-23 00:39:17 -03:00
|
|
|
/* We don't care about overflow or underflow. If the platform supports
|
|
|
|
* them, infinities and signed zeroes (on underflow) are fine.
|
|
|
|
* However, strtod can return 0 for denormalized numbers, where atof
|
|
|
|
* does not. So (alas!) we special-case a zero result. Note that
|
|
|
|
* whether strtod sets errno on underflow is not defined, so we can't
|
|
|
|
* key off errno.
|
|
|
|
*/
|
2000-09-25 18:01:28 -03:00
|
|
|
PyFPE_START_PROTECT("strtod", return NULL)
|
2000-09-23 00:39:17 -03:00
|
|
|
x = strtod(s, (char **)&end);
|
2000-09-25 18:01:28 -03:00
|
|
|
PyFPE_END_PROTECT(x)
|
1999-10-12 16:54:53 -03:00
|
|
|
errno = 0;
|
|
|
|
/* Believe it or not, Solaris 2.6 can move end *beyond* the null
|
2000-09-23 00:39:17 -03:00
|
|
|
byte at the end of the string, when the input is inf(inity). */
|
1999-10-12 16:54:53 -03:00
|
|
|
if (end > last)
|
|
|
|
end = last;
|
2000-09-23 00:39:17 -03:00
|
|
|
if (end == s) {
|
2001-11-28 16:52:21 -04:00
|
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
|
|
"invalid literal for float(): %.200s", s);
|
2000-09-23 00:39:17 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, buffer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Since end != s, the platform made *some* kind of sense out
|
|
|
|
of the input. Trust it. */
|
1999-10-12 16:54:53 -03:00
|
|
|
while (*end && isspace(Py_CHARMASK(*end)))
|
|
|
|
end++;
|
|
|
|
if (*end != '\0') {
|
2001-11-28 16:52:21 -04:00
|
|
|
PyOS_snprintf(buffer, sizeof(buffer),
|
|
|
|
"invalid literal for float(): %.200s", s);
|
1999-10-12 16:54:53 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, buffer);
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-03-10 18:55:18 -04:00
|
|
|
else if (end != last) {
|
1999-10-12 16:54:53 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"null byte in argument for float()");
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-09-23 00:39:17 -03:00
|
|
|
if (x == 0.0) {
|
|
|
|
/* See above -- may have been strtod being anal
|
|
|
|
about denorms. */
|
2000-09-25 18:01:28 -03:00
|
|
|
PyFPE_START_PROTECT("atof", return NULL)
|
2000-09-23 00:39:17 -03:00
|
|
|
x = atof(s);
|
2000-09-25 18:01:28 -03:00
|
|
|
PyFPE_END_PROTECT(x)
|
2000-09-23 00:39:17 -03:00
|
|
|
errno = 0; /* whether atof ever set errno is undefined */
|
1999-10-12 16:54:53 -03:00
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(x);
|
|
|
|
}
|
|
|
|
|
1993-06-17 09:35:49 -03:00
|
|
|
static void
|
2000-07-09 02:02:18 -03:00
|
|
|
float_dealloc(PyFloatObject *op)
|
1992-03-27 13:28:44 -04:00
|
|
|
{
|
2001-10-05 17:51:39 -03:00
|
|
|
if (PyFloat_CheckExact(op)) {
|
|
|
|
op->ob_type = (struct _typeobject *)free_list;
|
|
|
|
free_list = op;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
op->ob_type->tp_free((PyObject *)op);
|
1992-03-27 13:28:44 -04:00
|
|
|
}
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
double
|
2000-07-09 02:02:18 -03:00
|
|
|
PyFloat_AsDouble(PyObject *op)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
PyNumberMethods *nb;
|
|
|
|
PyFloatObject *fo;
|
1994-08-01 08:34:53 -03:00
|
|
|
double val;
|
2001-11-01 16:09:42 -04:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
if (op && PyFloat_Check(op))
|
|
|
|
return PyFloat_AS_DOUBLE((PyFloatObject*) op);
|
2001-11-01 16:09:42 -04:00
|
|
|
|
2002-11-18 12:06:21 -04:00
|
|
|
if (op == NULL) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_BadArgument();
|
1990-10-14 09:07:46 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2001-11-01 16:09:42 -04:00
|
|
|
|
2002-11-18 12:06:21 -04:00
|
|
|
if ((nb = op->ob_type->tp_as_number) == NULL || nb->nb_float == NULL) {
|
|
|
|
PyErr_SetString(PyExc_TypeError, "a float is required");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
fo = (PyFloatObject*) (*nb->nb_float) (op);
|
1994-08-01 08:34:53 -03:00
|
|
|
if (fo == NULL)
|
|
|
|
return -1;
|
1997-05-02 00:12:38 -03:00
|
|
|
if (!PyFloat_Check(fo)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"nb_float should return float object");
|
1994-08-01 08:34:53 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2001-11-01 16:09:42 -04:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
val = PyFloat_AS_DOUBLE(fo);
|
|
|
|
Py_DECREF(fo);
|
2001-11-01 16:09:42 -04:00
|
|
|
|
1994-08-01 08:34:53 -03:00
|
|
|
return val;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Methods */
|
|
|
|
|
2001-11-28 18:43:45 -04:00
|
|
|
static void
|
|
|
|
format_float(char *buf, size_t buflen, PyFloatObject *v, int precision)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
register char *cp;
|
|
|
|
/* Subroutine for float_repr and float_print.
|
|
|
|
We want float numbers to be recognizable as such,
|
|
|
|
i.e., they should contain a decimal point or an exponent.
|
|
|
|
However, %g may print the number as an integer;
|
|
|
|
in such cases, we append ".0" to the string. */
|
2001-11-28 18:43:45 -04:00
|
|
|
|
|
|
|
assert(PyFloat_Check(v));
|
|
|
|
PyOS_snprintf(buf, buflen, "%.*g", precision, v->ob_fval);
|
1990-10-14 09:07:46 -03:00
|
|
|
cp = buf;
|
|
|
|
if (*cp == '-')
|
|
|
|
cp++;
|
|
|
|
for (; *cp != '\0'; cp++) {
|
|
|
|
/* Any non-digit means it's not an integer;
|
|
|
|
this takes care of NAN and INF as well. */
|
1995-02-10 13:00:37 -04:00
|
|
|
if (!isdigit(Py_CHARMASK(*cp)))
|
1990-10-14 09:07:46 -03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*cp == '\0') {
|
|
|
|
*cp++ = '.';
|
|
|
|
*cp++ = '0';
|
|
|
|
*cp++ = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-11-28 18:43:45 -04:00
|
|
|
/* XXX PyFloat_AsStringEx should not be a public API function (for one
|
|
|
|
XXX thing, its signature passes a buffer without a length; for another,
|
|
|
|
XXX it isn't useful outside this file).
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
PyFloat_AsStringEx(char *buf, PyFloatObject *v, int precision)
|
|
|
|
{
|
|
|
|
format_float(buf, 100, v, precision);
|
|
|
|
}
|
|
|
|
|
2001-01-03 21:44:34 -04:00
|
|
|
/* Macro and helper that convert PyObject obj to a C double and store
|
|
|
|
the value in dbl; this replaces the functionality of the coercion
|
2001-12-11 16:31:34 -04:00
|
|
|
slot function. If conversion to double raises an exception, obj is
|
|
|
|
set to NULL, and the function invoking this macro returns NULL. If
|
|
|
|
obj is not of float, int or long type, Py_NotImplemented is incref'ed,
|
|
|
|
stored in obj, and returned from the function invoking this macro.
|
|
|
|
*/
|
2001-01-03 21:44:34 -04:00
|
|
|
#define CONVERT_TO_DOUBLE(obj, dbl) \
|
|
|
|
if (PyFloat_Check(obj)) \
|
|
|
|
dbl = PyFloat_AS_DOUBLE(obj); \
|
|
|
|
else if (convert_to_double(&(obj), &(dbl)) < 0) \
|
|
|
|
return obj;
|
|
|
|
|
|
|
|
static int
|
2001-09-04 02:14:19 -03:00
|
|
|
convert_to_double(PyObject **v, double *dbl)
|
2001-01-03 21:44:34 -04:00
|
|
|
{
|
|
|
|
register PyObject *obj = *v;
|
2001-09-04 02:14:19 -03:00
|
|
|
|
2001-01-03 21:44:34 -04:00
|
|
|
if (PyInt_Check(obj)) {
|
|
|
|
*dbl = (double)PyInt_AS_LONG(obj);
|
|
|
|
}
|
|
|
|
else if (PyLong_Check(obj)) {
|
|
|
|
*dbl = PyLong_AsDouble(obj);
|
2001-09-04 02:14:19 -03:00
|
|
|
if (*dbl == -1.0 && PyErr_Occurred()) {
|
|
|
|
*v = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
2001-01-03 21:44:34 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
*v = Py_NotImplemented;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-12-23 15:00:28 -04:00
|
|
|
/* Precisions used by repr() and str(), respectively.
|
|
|
|
|
|
|
|
The repr() precision (17 significant decimal digits) is the minimal number
|
|
|
|
that is guaranteed to have enough precision so that if the number is read
|
|
|
|
back in the exact same binary value is recreated. This is true for IEEE
|
|
|
|
floating point by design, and also happens to work for all other modern
|
|
|
|
hardware.
|
|
|
|
|
|
|
|
The str() precision is chosen so that in most cases, the rounding noise
|
|
|
|
created by various operations is suppressed, while giving plenty of
|
|
|
|
precision for practical use.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define PREC_REPR 17
|
|
|
|
#define PREC_STR 12
|
|
|
|
|
2001-11-28 18:43:45 -04:00
|
|
|
/* XXX PyFloat_AsString and PyFloat_AsReprString should be deprecated:
|
|
|
|
XXX they pass a char buffer without passing a length.
|
|
|
|
*/
|
1999-12-23 15:00:28 -04:00
|
|
|
void
|
2000-07-09 02:02:18 -03:00
|
|
|
PyFloat_AsString(char *buf, PyFloatObject *v)
|
1999-12-23 15:00:28 -04:00
|
|
|
{
|
2001-11-28 18:43:45 -04:00
|
|
|
format_float(buf, 100, v, PREC_STR);
|
1999-12-23 15:00:28 -04:00
|
|
|
}
|
|
|
|
|
2001-05-08 12:19:57 -03:00
|
|
|
void
|
|
|
|
PyFloat_AsReprString(char *buf, PyFloatObject *v)
|
|
|
|
{
|
2001-11-28 18:43:45 -04:00
|
|
|
format_float(buf, 100, v, PREC_REPR);
|
2001-05-08 12:19:57 -03:00
|
|
|
}
|
|
|
|
|
1992-03-27 13:28:44 -04:00
|
|
|
/* ARGSUSED */
|
1991-06-07 13:10:43 -03:00
|
|
|
static int
|
2000-07-09 02:02:18 -03:00
|
|
|
float_print(PyFloatObject *v, FILE *fp, int flags)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
char buf[100];
|
2001-11-28 18:43:45 -04:00
|
|
|
format_float(buf, sizeof(buf), v,
|
|
|
|
(flags & Py_PRINT_RAW) ? PREC_STR : PREC_REPR);
|
1990-10-14 09:07:46 -03:00
|
|
|
fputs(buf, fp);
|
1991-06-07 13:10:43 -03:00
|
|
|
return 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_repr(PyFloatObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
char buf[100];
|
2001-11-28 18:43:45 -04:00
|
|
|
format_float(buf, sizeof(buf), v, PREC_REPR);
|
1999-12-23 15:00:28 -04:00
|
|
|
return PyString_FromString(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_str(PyFloatObject *v)
|
1999-12-23 15:00:28 -04:00
|
|
|
{
|
|
|
|
char buf[100];
|
2001-11-28 18:43:45 -04:00
|
|
|
format_float(buf, sizeof(buf), v, PREC_STR);
|
1997-05-02 00:12:38 -03:00
|
|
|
return PyString_FromString(buf);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2000-07-09 02:02:18 -03:00
|
|
|
float_compare(PyFloatObject *v, PyFloatObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
double i = v->ob_fval;
|
|
|
|
double j = w->ob_fval;
|
|
|
|
return (i < j) ? -1 : (i > j) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
1993-03-29 06:43:31 -04:00
|
|
|
static long
|
2000-07-09 02:02:18 -03:00
|
|
|
float_hash(PyFloatObject *v)
|
1993-03-29 06:43:31 -04:00
|
|
|
{
|
2000-08-15 00:34:48 -03:00
|
|
|
return _Py_HashDouble(v->ob_fval);
|
1993-03-29 06:43:31 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_add(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2001-01-03 21:44:34 -04:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("add", return 0)
|
2001-01-03 21:44:34 -04:00
|
|
|
a = a + b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_sub(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2001-01-03 21:44:34 -04:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("subtract", return 0)
|
2001-01-03 21:44:34 -04:00
|
|
|
a = a - b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_mul(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2001-01-03 21:44:34 -04:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("multiply", return 0)
|
2001-01-03 21:44:34 -04:00
|
|
|
a = a * b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_div(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2001-01-03 21:44:34 -04:00
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
|
|
|
if (b == 0.0) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError, "float division");
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("divide", return 0)
|
2001-01-03 21:44:34 -04:00
|
|
|
a = a / b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
Add warning mode for classic division, almost exactly as specified in
PEP 238. Changes:
- add a new flag variable Py_DivisionWarningFlag, declared in
pydebug.h, defined in object.c, set in main.c, and used in
{int,long,float,complex}object.c. When this flag is set, the
classic division operator issues a DeprecationWarning message.
- add a new API PyRun_SimpleStringFlags() to match
PyRun_SimpleString(). The main() function calls this so that
commands run with -c can also benefit from -Dnew.
- While I was at it, I changed the usage message in main() somewhat:
alphabetized the options, split it in *four* parts to fit in under
512 bytes (not that I still believe this is necessary -- doc strings
elsewhere are much longer), and perhaps most visibly, don't display
the full list of options on each command line error. Instead, the
full list is only displayed when -h is used, and otherwise a brief
reminder of -h is displayed. When -h is used, write to stdout so
that you can do `python -h | more'.
Notes:
- I don't want to use the -W option to control whether the classic
division warning is issued or not, because the machinery to decide
whether to display the warning or not is very expensive (it involves
calling into the warnings.py module). You can use -Werror to turn
the warnings into exceptions though.
- The -Dnew option doesn't select future division for all of the
program -- only for the __main__ module. I don't know if I'll ever
change this -- it would require changes to the .pyc file magic
number to do it right, and a more global notion of compiler flags.
- You can usefully combine -Dwarn and -Dnew: this gives the __main__
module new division, and warns about classic division everywhere
else.
2001-08-31 14:40:15 -03:00
|
|
|
static PyObject *
|
|
|
|
float_classic_div(PyObject *v, PyObject *w)
|
|
|
|
{
|
|
|
|
double a,b;
|
|
|
|
CONVERT_TO_DOUBLE(v, a);
|
|
|
|
CONVERT_TO_DOUBLE(w, b);
|
2001-09-04 00:51:09 -03:00
|
|
|
if (Py_DivisionWarningFlag >= 2 &&
|
Add warning mode for classic division, almost exactly as specified in
PEP 238. Changes:
- add a new flag variable Py_DivisionWarningFlag, declared in
pydebug.h, defined in object.c, set in main.c, and used in
{int,long,float,complex}object.c. When this flag is set, the
classic division operator issues a DeprecationWarning message.
- add a new API PyRun_SimpleStringFlags() to match
PyRun_SimpleString(). The main() function calls this so that
commands run with -c can also benefit from -Dnew.
- While I was at it, I changed the usage message in main() somewhat:
alphabetized the options, split it in *four* parts to fit in under
512 bytes (not that I still believe this is necessary -- doc strings
elsewhere are much longer), and perhaps most visibly, don't display
the full list of options on each command line error. Instead, the
full list is only displayed when -h is used, and otherwise a brief
reminder of -h is displayed. When -h is used, write to stdout so
that you can do `python -h | more'.
Notes:
- I don't want to use the -W option to control whether the classic
division warning is issued or not, because the machinery to decide
whether to display the warning or not is very expensive (it involves
calling into the warnings.py module). You can use -Werror to turn
the warnings into exceptions though.
- The -Dnew option doesn't select future division for all of the
program -- only for the __main__ module. I don't know if I'll ever
change this -- it would require changes to the .pyc file magic
number to do it right, and a more global notion of compiler flags.
- You can usefully combine -Dwarn and -Dnew: this gives the __main__
module new division, and warns about classic division everywhere
else.
2001-08-31 14:40:15 -03:00
|
|
|
PyErr_Warn(PyExc_DeprecationWarning, "classic float division") < 0)
|
|
|
|
return NULL;
|
|
|
|
if (b == 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError, "float division");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyFPE_START_PROTECT("divide", return 0)
|
|
|
|
a = a / b;
|
|
|
|
PyFPE_END_PROTECT(a)
|
|
|
|
return PyFloat_FromDouble(a);
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_rem(PyObject *v, PyObject *w)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1992-01-26 14:16:35 -04:00
|
|
|
double vx, wx;
|
1999-05-06 11:26:34 -03:00
|
|
|
double mod;
|
2001-01-03 21:44:34 -04:00
|
|
|
CONVERT_TO_DOUBLE(v, vx);
|
|
|
|
CONVERT_TO_DOUBLE(w, wx);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (wx == 0.0) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError, "float modulo");
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("modulo", return 0)
|
1992-01-26 14:16:35 -04:00
|
|
|
mod = fmod(vx, wx);
|
1999-05-06 11:26:34 -03:00
|
|
|
/* note: checking mod*wx < 0 is incorrect -- underflows to
|
|
|
|
0 if wx < sqrt(smallest nonzero double) */
|
|
|
|
if (mod && ((wx < 0) != (mod < 0))) {
|
1992-01-26 14:16:35 -04:00
|
|
|
mod += wx;
|
|
|
|
}
|
1997-03-14 00:32:50 -04:00
|
|
|
PyFPE_END_PROTECT(mod)
|
1997-05-02 00:12:38 -03:00
|
|
|
return PyFloat_FromDouble(mod);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_divmod(PyObject *v, PyObject *w)
|
1991-05-05 17:07:00 -03:00
|
|
|
{
|
1991-10-20 17:16:45 -03:00
|
|
|
double vx, wx;
|
1999-05-06 11:26:34 -03:00
|
|
|
double div, mod, floordiv;
|
2001-01-03 21:44:34 -04:00
|
|
|
CONVERT_TO_DOUBLE(v, vx);
|
|
|
|
CONVERT_TO_DOUBLE(w, wx);
|
1991-10-20 17:16:45 -03:00
|
|
|
if (wx == 0.0) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
|
1991-10-20 17:16:45 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-02-14 18:54:21 -04:00
|
|
|
PyFPE_START_PROTECT("divmod", return 0)
|
1991-10-20 17:16:45 -03:00
|
|
|
mod = fmod(vx, wx);
|
2000-09-16 00:54:24 -03:00
|
|
|
/* fmod is typically exact, so vx-mod is *mathematically* an
|
1999-05-06 11:26:34 -03:00
|
|
|
exact multiple of wx. But this is fp arithmetic, and fp
|
|
|
|
vx - mod is an approximation; the result is that div may
|
|
|
|
not be an exact integral value after the division, although
|
|
|
|
it will always be very close to one.
|
|
|
|
*/
|
1991-10-20 17:16:45 -03:00
|
|
|
div = (vx - mod) / wx;
|
2001-11-01 19:12:27 -04:00
|
|
|
if (mod) {
|
|
|
|
/* ensure the remainder has the same sign as the denominator */
|
|
|
|
if ((wx < 0) != (mod < 0)) {
|
|
|
|
mod += wx;
|
|
|
|
div -= 1.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* the remainder is zero, and in the presence of signed zeroes
|
|
|
|
fmod returns different results across platforms; ensure
|
|
|
|
it has the same sign as the denominator; we'd like to do
|
|
|
|
"mod = wx * 0.0", but that may get optimized away */
|
2001-11-01 19:59:56 -04:00
|
|
|
mod *= mod; /* hide "mod = +0" from optimizer */
|
2001-11-01 19:12:27 -04:00
|
|
|
if (wx < 0.0)
|
|
|
|
mod = -mod;
|
1991-10-20 17:16:45 -03:00
|
|
|
}
|
1999-05-06 11:26:34 -03:00
|
|
|
/* snap quotient to nearest integral value */
|
2001-11-01 19:12:27 -04:00
|
|
|
if (div) {
|
|
|
|
floordiv = floor(div);
|
|
|
|
if (div - floordiv > 0.5)
|
|
|
|
floordiv += 1.0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* div is zero - get the same sign as the true quotient */
|
|
|
|
div *= div; /* hide "div = +0" from optimizers */
|
|
|
|
floordiv = div * vx / wx; /* zero w/ sign of vx/wx */
|
|
|
|
}
|
|
|
|
PyFPE_END_PROTECT(floordiv)
|
1999-05-06 11:26:34 -03:00
|
|
|
return Py_BuildValue("(dd)", floordiv, mod);
|
1991-05-05 17:07:00 -03:00
|
|
|
}
|
|
|
|
|
2001-12-11 15:57:24 -04:00
|
|
|
static PyObject *
|
|
|
|
float_floor_div(PyObject *v, PyObject *w)
|
|
|
|
{
|
|
|
|
PyObject *t, *r;
|
|
|
|
|
|
|
|
t = float_divmod(v, w);
|
2001-12-11 16:31:34 -04:00
|
|
|
if (t == NULL || t == Py_NotImplemented)
|
|
|
|
return t;
|
|
|
|
assert(PyTuple_CheckExact(t));
|
|
|
|
r = PyTuple_GET_ITEM(t, 0);
|
|
|
|
Py_INCREF(r);
|
|
|
|
Py_DECREF(t);
|
|
|
|
return r;
|
2001-12-11 15:57:24 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2001-01-03 21:44:34 -04:00
|
|
|
float_pow(PyObject *v, PyObject *w, PyObject *z)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
double iv, iw, ix;
|
2001-09-03 05:35:41 -03:00
|
|
|
|
|
|
|
if ((PyObject *)z != Py_None) {
|
2001-09-05 03:24:58 -03:00
|
|
|
PyErr_SetString(PyExc_TypeError, "pow() 3rd argument not "
|
2001-09-05 20:49:24 -03:00
|
|
|
"allowed unless all arguments are integers");
|
2001-09-03 05:35:41 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2001-01-03 21:44:34 -04:00
|
|
|
CONVERT_TO_DOUBLE(v, iv);
|
|
|
|
CONVERT_TO_DOUBLE(w, iw);
|
2000-10-05 21:36:09 -03:00
|
|
|
|
|
|
|
/* Sort out special cases here instead of relying on pow() */
|
2001-08-23 19:31:37 -03:00
|
|
|
if (iw == 0) { /* v**0 is 1, even 0**0 */
|
2000-10-05 21:36:09 -03:00
|
|
|
PyFPE_START_PROTECT("pow", return NULL)
|
|
|
|
if ((PyObject *)z != Py_None) {
|
2001-01-03 21:44:34 -04:00
|
|
|
double iz;
|
2001-01-08 02:29:50 -04:00
|
|
|
CONVERT_TO_DOUBLE(z, iz);
|
2001-08-23 19:31:37 -03:00
|
|
|
ix = fmod(1.0, iz);
|
|
|
|
if (ix != 0 && iz < 0)
|
|
|
|
ix += iz;
|
1996-01-11 21:22:56 -04:00
|
|
|
}
|
2000-10-05 21:36:09 -03:00
|
|
|
else
|
|
|
|
ix = 1.0;
|
|
|
|
PyFPE_END_PROTECT(ix)
|
2001-11-01 16:09:42 -04:00
|
|
|
return PyFloat_FromDouble(ix);
|
2000-10-05 21:36:09 -03:00
|
|
|
}
|
2001-08-23 19:31:37 -03:00
|
|
|
if (iv == 0.0) { /* 0**w is error if w<0, else 1 */
|
2000-10-05 21:36:09 -03:00
|
|
|
if (iw < 0.0) {
|
|
|
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
2000-10-24 16:57:45 -03:00
|
|
|
"0.0 cannot be raised to a negative power");
|
2000-10-05 21:36:09 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return PyFloat_FromDouble(0.0);
|
|
|
|
}
|
2001-08-23 19:31:37 -03:00
|
|
|
if (iv < 0.0 && iw != floor(iw)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"negative number cannot be raised to a fractional power");
|
|
|
|
return NULL;
|
1991-05-28 18:57:39 -03:00
|
|
|
}
|
2001-08-23 19:31:37 -03:00
|
|
|
errno = 0;
|
|
|
|
PyFPE_START_PROTECT("pow", return NULL)
|
|
|
|
ix = pow(iv, iw);
|
|
|
|
PyFPE_END_PROTECT(ix)
|
2002-03-09 00:58:24 -04:00
|
|
|
Py_ADJUST_ERANGE1(ix);
|
1990-10-21 19:15:08 -03:00
|
|
|
if (errno != 0) {
|
2002-03-09 00:58:24 -04:00
|
|
|
assert(errno == ERANGE);
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_OverflowError);
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
1990-10-21 19:15:08 -03:00
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return PyFloat_FromDouble(ix);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_neg(PyFloatObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
return PyFloat_FromDouble(-v->ob_fval);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_pos(PyFloatObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2001-09-11 18:53:35 -03:00
|
|
|
if (PyFloat_CheckExact(v)) {
|
|
|
|
Py_INCREF(v);
|
|
|
|
return (PyObject *)v;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return PyFloat_FromDouble(v->ob_fval);
|
1991-05-05 17:07:00 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_abs(PyFloatObject *v)
|
1991-05-05 17:07:00 -03:00
|
|
|
{
|
2001-11-01 17:51:15 -04:00
|
|
|
return PyFloat_FromDouble(fabs(v->ob_fval));
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1991-05-14 08:57:01 -03:00
|
|
|
static int
|
2000-07-09 02:02:18 -03:00
|
|
|
float_nonzero(PyFloatObject *v)
|
1991-05-14 08:57:01 -03:00
|
|
|
{
|
|
|
|
return v->ob_fval != 0.0;
|
|
|
|
}
|
|
|
|
|
1993-06-17 09:35:49 -03:00
|
|
|
static int
|
2000-07-09 02:02:18 -03:00
|
|
|
float_coerce(PyObject **pv, PyObject **pw)
|
1992-08-14 09:06:52 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
if (PyInt_Check(*pw)) {
|
|
|
|
long x = PyInt_AsLong(*pw);
|
|
|
|
*pw = PyFloat_FromDouble((double)x);
|
|
|
|
Py_INCREF(*pv);
|
1992-08-14 09:06:52 -03:00
|
|
|
return 0;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
else if (PyLong_Check(*pw)) {
|
|
|
|
*pw = PyFloat_FromDouble(PyLong_AsDouble(*pw));
|
|
|
|
Py_INCREF(*pv);
|
1992-08-14 09:06:52 -03:00
|
|
|
return 0;
|
|
|
|
}
|
2001-09-18 22:25:16 -03:00
|
|
|
else if (PyFloat_Check(*pw)) {
|
|
|
|
Py_INCREF(*pv);
|
|
|
|
Py_INCREF(*pw);
|
|
|
|
return 0;
|
|
|
|
}
|
1992-08-14 09:06:52 -03:00
|
|
|
return 1; /* Can't do it */
|
|
|
|
}
|
|
|
|
|
2002-11-19 16:49:15 -04:00
|
|
|
static PyObject *
|
|
|
|
float_long(PyObject *v)
|
|
|
|
{
|
|
|
|
double x = PyFloat_AsDouble(v);
|
|
|
|
return PyLong_FromDouble(x);
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_int(PyObject *v)
|
1992-09-12 08:09:23 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
double x = PyFloat_AsDouble(v);
|
2001-07-26 17:02:17 -03:00
|
|
|
double wholepart; /* integral portion of x, rounded toward 0 */
|
|
|
|
|
|
|
|
(void)modf(x, &wholepart);
|
2002-11-21 18:26:37 -04:00
|
|
|
/* Try to get out cheap if this fits in a Python int. The attempt
|
|
|
|
* to cast to long must be protected, as C doesn't define what
|
|
|
|
* happens if the double is too big to fit in a long. Some rare
|
|
|
|
* systems raise an exception then (RISCOS was mentioned as one,
|
|
|
|
* and someone using a non-default option on Sun also bumped into
|
|
|
|
* that). Note that checking for >= and <= LONG_{MIN,MAX} would
|
|
|
|
* still be vulnerable: if a long has more bits of precision than
|
|
|
|
* a double, casting MIN/MAX to double may yield an approximation,
|
|
|
|
* and if that's rounded up, then, e.g., wholepart=LONG_MAX+1 would
|
|
|
|
* yield true from the C expression wholepart<=LONG_MAX, despite
|
|
|
|
* that wholepart is actually greater than LONG_MAX.
|
|
|
|
*/
|
|
|
|
if (LONG_MIN < wholepart && wholepart < LONG_MAX) {
|
|
|
|
const long aslong = (long)wholepart;
|
2001-07-26 17:02:17 -03:00
|
|
|
return PyInt_FromLong(aslong);
|
2002-11-21 18:26:37 -04:00
|
|
|
}
|
|
|
|
return PyLong_FromDouble(wholepart);
|
1992-09-12 08:09:23 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 02:02:18 -03:00
|
|
|
float_float(PyObject *v)
|
1992-09-12 08:09:23 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(v);
|
1992-09-12 08:09:23 -03:00
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-07-17 13:30:39 -03:00
|
|
|
static PyObject *
|
2001-08-29 12:47:46 -03:00
|
|
|
float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
static PyObject *
|
|
|
|
float_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyObject *x = Py_False; /* Integer zero */
|
|
|
|
static char *kwlist[] = {"x", 0};
|
|
|
|
|
2001-08-29 12:47:46 -03:00
|
|
|
if (type != &PyFloat_Type)
|
|
|
|
return float_subtype_new(type, args, kwds); /* Wimp out */
|
2001-08-02 01:15:00 -03:00
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x))
|
|
|
|
return NULL;
|
|
|
|
if (PyString_Check(x))
|
|
|
|
return PyFloat_FromString(x, NULL);
|
|
|
|
return PyNumber_Float(x);
|
|
|
|
}
|
|
|
|
|
2001-08-29 12:47:46 -03:00
|
|
|
/* Wimpy, slow approach to tp_new calls for subtypes of float:
|
|
|
|
first create a regular float from whatever arguments we got,
|
|
|
|
then allocate a subtype instance and initialize its ob_fval
|
|
|
|
from the regular float. The regular float is then thrown away.
|
|
|
|
*/
|
|
|
|
static PyObject *
|
|
|
|
float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyObject *tmp, *new;
|
|
|
|
|
|
|
|
assert(PyType_IsSubtype(type, &PyFloat_Type));
|
|
|
|
tmp = float_new(&PyFloat_Type, args, kwds);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
2001-09-12 16:12:49 -03:00
|
|
|
assert(PyFloat_CheckExact(tmp));
|
2001-08-30 00:09:31 -03:00
|
|
|
new = type->tp_alloc(type, 0);
|
2001-08-29 12:47:46 -03:00
|
|
|
if (new == NULL)
|
|
|
|
return NULL;
|
|
|
|
((PyFloatObject *)new)->ob_fval = ((PyFloatObject *)tmp)->ob_fval;
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(float_doc,
|
2001-08-02 01:15:00 -03:00
|
|
|
"float(x) -> floating point number\n\
|
|
|
|
\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
Convert a string or number to a floating point number, if possible.");
|
2001-08-02 01:15:00 -03:00
|
|
|
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyNumberMethods float_as_number = {
|
1994-08-01 08:34:53 -03:00
|
|
|
(binaryfunc)float_add, /*nb_add*/
|
|
|
|
(binaryfunc)float_sub, /*nb_subtract*/
|
|
|
|
(binaryfunc)float_mul, /*nb_multiply*/
|
Add warning mode for classic division, almost exactly as specified in
PEP 238. Changes:
- add a new flag variable Py_DivisionWarningFlag, declared in
pydebug.h, defined in object.c, set in main.c, and used in
{int,long,float,complex}object.c. When this flag is set, the
classic division operator issues a DeprecationWarning message.
- add a new API PyRun_SimpleStringFlags() to match
PyRun_SimpleString(). The main() function calls this so that
commands run with -c can also benefit from -Dnew.
- While I was at it, I changed the usage message in main() somewhat:
alphabetized the options, split it in *four* parts to fit in under
512 bytes (not that I still believe this is necessary -- doc strings
elsewhere are much longer), and perhaps most visibly, don't display
the full list of options on each command line error. Instead, the
full list is only displayed when -h is used, and otherwise a brief
reminder of -h is displayed. When -h is used, write to stdout so
that you can do `python -h | more'.
Notes:
- I don't want to use the -W option to control whether the classic
division warning is issued or not, because the machinery to decide
whether to display the warning or not is very expensive (it involves
calling into the warnings.py module). You can use -Werror to turn
the warnings into exceptions though.
- The -Dnew option doesn't select future division for all of the
program -- only for the __main__ module. I don't know if I'll ever
change this -- it would require changes to the .pyc file magic
number to do it right, and a more global notion of compiler flags.
- You can usefully combine -Dwarn and -Dnew: this gives the __main__
module new division, and warns about classic division everywhere
else.
2001-08-31 14:40:15 -03:00
|
|
|
(binaryfunc)float_classic_div, /*nb_divide*/
|
1994-08-01 08:34:53 -03:00
|
|
|
(binaryfunc)float_rem, /*nb_remainder*/
|
|
|
|
(binaryfunc)float_divmod, /*nb_divmod*/
|
1994-08-12 09:52:35 -03:00
|
|
|
(ternaryfunc)float_pow, /*nb_power*/
|
1994-08-01 08:34:53 -03:00
|
|
|
(unaryfunc)float_neg, /*nb_negative*/
|
|
|
|
(unaryfunc)float_pos, /*nb_positive*/
|
|
|
|
(unaryfunc)float_abs, /*nb_absolute*/
|
|
|
|
(inquiry)float_nonzero, /*nb_nonzero*/
|
1991-10-24 11:55:28 -03:00
|
|
|
0, /*nb_invert*/
|
|
|
|
0, /*nb_lshift*/
|
|
|
|
0, /*nb_rshift*/
|
|
|
|
0, /*nb_and*/
|
|
|
|
0, /*nb_xor*/
|
|
|
|
0, /*nb_or*/
|
1994-08-01 08:34:53 -03:00
|
|
|
(coercion)float_coerce, /*nb_coerce*/
|
|
|
|
(unaryfunc)float_int, /*nb_int*/
|
|
|
|
(unaryfunc)float_long, /*nb_long*/
|
|
|
|
(unaryfunc)float_float, /*nb_float*/
|
2001-08-08 02:00:18 -03:00
|
|
|
0, /* nb_oct */
|
|
|
|
0, /* nb_hex */
|
|
|
|
0, /* nb_inplace_add */
|
|
|
|
0, /* nb_inplace_subtract */
|
|
|
|
0, /* nb_inplace_multiply */
|
|
|
|
0, /* nb_inplace_divide */
|
|
|
|
0, /* nb_inplace_remainder */
|
|
|
|
0, /* nb_inplace_power */
|
|
|
|
0, /* nb_inplace_lshift */
|
|
|
|
0, /* nb_inplace_rshift */
|
|
|
|
0, /* nb_inplace_and */
|
|
|
|
0, /* nb_inplace_xor */
|
|
|
|
0, /* nb_inplace_or */
|
2001-12-11 15:57:24 -04:00
|
|
|
float_floor_div, /* nb_floor_divide */
|
2001-08-08 02:00:18 -03:00
|
|
|
float_div, /* nb_true_divide */
|
|
|
|
0, /* nb_inplace_floor_divide */
|
|
|
|
0, /* nb_inplace_true_divide */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTypeObject PyFloat_Type = {
|
|
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
1990-10-14 09:07:46 -03:00
|
|
|
0,
|
|
|
|
"float",
|
1997-05-02 00:12:38 -03:00
|
|
|
sizeof(PyFloatObject),
|
1990-10-14 09:07:46 -03:00
|
|
|
0,
|
2001-08-02 01:15:00 -03:00
|
|
|
(destructor)float_dealloc, /* tp_dealloc */
|
|
|
|
(printfunc)float_print, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
(cmpfunc)float_compare, /* tp_compare */
|
|
|
|
(reprfunc)float_repr, /* tp_repr */
|
|
|
|
&float_as_number, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
(hashfunc)float_hash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
(reprfunc)float_str, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2001-08-29 12:47:46 -03:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES |
|
|
|
|
Py_TPFLAGS_BASETYPE, /* tp_flags */
|
2001-08-02 01:15:00 -03:00
|
|
|
float_doc, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
0, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
float_new, /* tp_new */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
1997-08-04 23:16:08 -03:00
|
|
|
|
|
|
|
void
|
2000-07-09 02:02:18 -03:00
|
|
|
PyFloat_Fini(void)
|
1997-08-04 23:16:08 -03:00
|
|
|
{
|
1999-03-12 15:43:17 -04:00
|
|
|
PyFloatObject *p;
|
|
|
|
PyFloatBlock *list, *next;
|
1999-03-11 20:12:21 -04:00
|
|
|
int i;
|
|
|
|
int bc, bf; /* block count, number of freed blocks */
|
|
|
|
int frem, fsum; /* remaining unfreed floats per block, total */
|
|
|
|
|
|
|
|
bc = 0;
|
|
|
|
bf = 0;
|
|
|
|
fsum = 0;
|
|
|
|
list = block_list;
|
|
|
|
block_list = NULL;
|
1999-03-19 16:59:40 -04:00
|
|
|
free_list = NULL;
|
1999-03-11 20:12:21 -04:00
|
|
|
while (list != NULL) {
|
|
|
|
bc++;
|
|
|
|
frem = 0;
|
1999-03-19 16:59:40 -04:00
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
2001-09-11 13:13:52 -03:00
|
|
|
if (PyFloat_CheckExact(p) && p->ob_refcnt != 0)
|
1999-03-11 20:12:21 -04:00
|
|
|
frem++;
|
|
|
|
}
|
1999-03-12 15:43:17 -04:00
|
|
|
next = list->next;
|
1999-03-11 20:12:21 -04:00
|
|
|
if (frem) {
|
1999-03-12 15:43:17 -04:00
|
|
|
list->next = block_list;
|
|
|
|
block_list = list;
|
1999-03-19 16:59:40 -04:00
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
2001-09-11 13:13:52 -03:00
|
|
|
if (!PyFloat_CheckExact(p) ||
|
2001-08-29 12:47:46 -03:00
|
|
|
p->ob_refcnt == 0) {
|
1999-03-19 16:59:40 -04:00
|
|
|
p->ob_type = (struct _typeobject *)
|
|
|
|
free_list;
|
|
|
|
free_list = p;
|
|
|
|
}
|
|
|
|
}
|
1999-03-11 20:12:21 -04:00
|
|
|
}
|
|
|
|
else {
|
2000-05-03 20:44:39 -03:00
|
|
|
PyMem_FREE(list); /* XXX PyObject_FREE ??? */
|
1999-03-11 20:12:21 -04:00
|
|
|
bf++;
|
|
|
|
}
|
|
|
|
fsum += frem;
|
1999-03-12 15:43:17 -04:00
|
|
|
list = next;
|
1999-03-11 20:12:21 -04:00
|
|
|
}
|
1999-03-12 15:43:17 -04:00
|
|
|
if (!Py_VerboseFlag)
|
|
|
|
return;
|
|
|
|
fprintf(stderr, "# cleanup floats");
|
|
|
|
if (!fsum) {
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr,
|
|
|
|
": %d unfreed float%s in %d out of %d block%s\n",
|
|
|
|
fsum, fsum == 1 ? "" : "s",
|
|
|
|
bc - bf, bc, bc == 1 ? "" : "s");
|
|
|
|
}
|
|
|
|
if (Py_VerboseFlag > 1) {
|
|
|
|
list = block_list;
|
|
|
|
while (list != NULL) {
|
1999-03-19 16:59:40 -04:00
|
|
|
for (i = 0, p = &list->objects[0];
|
|
|
|
i < N_FLOATOBJECTS;
|
|
|
|
i++, p++) {
|
2001-09-11 13:13:52 -03:00
|
|
|
if (PyFloat_CheckExact(p) &&
|
2001-08-29 12:47:46 -03:00
|
|
|
p->ob_refcnt != 0) {
|
1999-03-12 15:43:17 -04:00
|
|
|
char buf[100];
|
|
|
|
PyFloat_AsString(buf, p);
|
|
|
|
fprintf(stderr,
|
2000-06-30 12:01:00 -03:00
|
|
|
"# <float at %p, refcnt=%d, val=%s>\n",
|
|
|
|
p, p->ob_refcnt, buf);
|
1999-03-12 15:43:17 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
list = list->next;
|
1999-03-11 20:12:21 -04:00
|
|
|
}
|
|
|
|
}
|
1997-08-04 23:16:08 -03:00
|
|
|
}
|