/* Primitive operations on floating point for GNU Emacs Lisp interpreter.
- Copyright (C) 1988, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#ifdef LISP_FLOAT_TYPE
-#if 0 /* That is untrue--XINT is used below, and it uses INTBITS.
- What in the world is values.h, anyway? */
#ifdef MSDOS
-/* These are redefined in <values.h> and not used here */
+/* These are redefined (correctly, but differently) in values.h. */
#undef INTBITS
#undef LONGBITS
#undef SHORTBITS
#endif
-#endif
/* Work around a problem that happens because math.h on hpux 7
defines two static variables--which, in Emacs, are not really static,
#include <math.h>
/* This declaration is omitted on some systems, like Ultrix. */
-#if !defined (hpux) && defined (HAVE_LOGB)
+#if !defined (HPUX) && defined (HAVE_LOGB) && !defined (logb)
extern double logb ();
-#endif /* !hpux && HAVE_LOGB */
+#endif /* not HPUX and HAVE_LOGB and no logb macro */
-#ifndef MSDOS
#if defined(DOMAIN) && defined(SING) && defined(OVERFLOW)
/* If those are defined, then this is probably a `matherr' machine. */
# ifndef HAVE_MATHERR
# define HAVE_MATHERR
# endif
#endif
-#endif
#ifdef NO_MATHERR
#undef HAVE_MATHERR
#define IN_FLOAT2(d, name, num, num2) (in_float = 1, (d), in_float = 0)
#endif
+/* Convert float to Lisp_Int if it fits, else signal a range error
+ using the given arguments. */
+#define FLOAT_TO_INT(x, i, name, num) \
+ do \
+ { \
+ if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \
+ (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \
+ range_error (name, num); \
+ XSETINT (i, (EMACS_INT)(x)); \
+ } \
+ while (0)
+#define FLOAT_TO_INT2(x, i, name, num1, num2) \
+ do \
+ { \
+ if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \
+ (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \
+ range_error2 (name, num1, num2); \
+ XSETINT (i, (EMACS_INT)(x)); \
+ } \
+ while (0)
+
#define arith_error(op,arg) \
Fsignal (Qarith_error, Fcons (build_string ((op)), Fcons ((arg), Qnil)))
#define range_error(op,arg) \
Fsignal (Qrange_error, Fcons (build_string ((op)), Fcons ((arg), Qnil)))
+#define range_error2(op,a1,a2) \
+ Fsignal (Qrange_error, Fcons (build_string ((op)), \
+ Fcons ((a1), Fcons ((a2), Qnil))))
#define domain_error(op,arg) \
Fsignal (Qdomain_error, Fcons (build_string ((op)), Fcons ((arg), Qnil)))
#define domain_error2(op,a1,a2) \
- Fsignal (Qdomain_error, Fcons (build_string ((op)), Fcons ((a1), Fcons ((a2), Qnil))))
+ Fsignal (Qdomain_error, Fcons (build_string ((op)), \
+ Fcons ((a1), Fcons ((a2), Qnil))))
/* Extract a Lisp number as a `double', or signal an error. */
{
CHECK_NUMBER_OR_FLOAT (num, 0);
- if (XTYPE (num) == Lisp_Float)
+ if (FLOATP (num))
return XFLOAT (num)->data;
return (double) XINT (num);
}
CHECK_NUMBER_OR_FLOAT (arg1, 0);
CHECK_NUMBER_OR_FLOAT (arg2, 0);
- if (XTYPE (arg1) == Lisp_Int /* common lisp spec */
- && XTYPE (arg2) == Lisp_Int) /* don't promote, if both are ints */
+ if (INTEGERP (arg1) /* common lisp spec */
+ && INTEGERP (arg2)) /* don't promote, if both are ints */
{ /* this can be improved by pre-calculating */
- int acc, x, y; /* some binary powers of x then accumulating */
+ EMACS_INT acc, x, y; /* some binary powers of x then accumulating */
Lisp_Object val;
x = XINT (arg1);
y = (unsigned)y >> 1;
}
}
- XSET (val, Lisp_Int, acc);
+ XSETINT (val, acc);
return val;
}
- f1 = (XTYPE (arg1) == Lisp_Float) ? XFLOAT (arg1)->data : XINT (arg1);
- f2 = (XTYPE (arg2) == Lisp_Float) ? XFLOAT (arg2)->data : XINT (arg2);
+ f1 = FLOATP (arg1) ? XFLOAT (arg1)->data : XINT (arg1);
+ f2 = FLOATP (arg2) ? XFLOAT (arg2)->data : XINT (arg2);
/* Really should check for overflow, too */
if (f1 == 0.0 && f2 == 0.0)
f1 = 1.0;
{
CHECK_NUMBER_OR_FLOAT (arg, 0);
- if (XTYPE (arg) == Lisp_Float)
+ if (FLOATP (arg))
IN_FLOAT (arg = make_float (fabs (XFLOAT (arg)->data)), "abs", arg);
else if (XINT (arg) < 0)
- XSETINT (arg, - XFASTINT (arg));
+ XSETINT (arg, - XINT (arg));
return arg;
}
{
CHECK_NUMBER_OR_FLOAT (arg, 0);
- if (XTYPE (arg) == Lisp_Int)
+ if (INTEGERP (arg))
return make_float ((double) XINT (arg));
else /* give 'em the same float back */
return arg;
Lisp_Object arg;
{
Lisp_Object val;
- int value;
+ EMACS_INT value;
double f = extract_float (arg);
if (f == 0.0)
IN_FLOAT (value = logb (f), "logb", arg);
#else
#ifdef HAVE_FREXP
- IN_FLOAT (frexp (f, &value), "logb", arg);
- value--;
+ int ivalue;
+ IN_FLOAT (frexp (f, &ivalue), "logb", arg);
+ value = ivalue - 1;
#else
int i;
double d;
#endif
#endif
}
- XSET (val, Lisp_Int, value);
+ XSETINT (val, value);
return val;
}
{
CHECK_NUMBER_OR_FLOAT (arg, 0);
- if (XTYPE (arg) == Lisp_Float)
- IN_FLOAT (XSET (arg, Lisp_Int, ceil (XFLOAT (arg)->data)), "ceiling", arg);
+ if (FLOATP (arg))
+ {
+ double d;
+
+ IN_FLOAT (d = ceil (XFLOAT (arg)->data), "ceiling", arg);
+ FLOAT_TO_INT (d, arg, "ceiling", arg);
+ }
return arg;
}
if (! NILP (divisor))
{
- int i1, i2;
+ EMACS_INT i1, i2;
CHECK_NUMBER_OR_FLOAT (divisor, 1);
#ifdef LISP_FLOAT_TYPE
- if (XTYPE (arg) == Lisp_Float || XTYPE (divisor) == Lisp_Float)
+ if (FLOATP (arg) || FLOATP (divisor))
{
double f1, f2;
- f1 = XTYPE (arg) == Lisp_Float ? XFLOAT (arg)->data : XINT (arg);
- f2 = (XTYPE (divisor) == Lisp_Float
- ? XFLOAT (divisor)->data : XINT (divisor));
+ f1 = FLOATP (arg) ? XFLOAT (arg)->data : XINT (arg);
+ f2 = (FLOATP (divisor) ? XFLOAT (divisor)->data : XINT (divisor));
if (f2 == 0)
Fsignal (Qarith_error, Qnil);
- IN_FLOAT2 (XSET (arg, Lisp_Int, floor (f1 / f2)),
- "floor", arg, divisor);
+ IN_FLOAT2 (f1 = floor (f1 / f2), "floor", arg, divisor);
+ FLOAT_TO_INT2 (f1, arg, "floor", arg, divisor);
return arg;
}
#endif
? (i1 <= 0 ? -i1 / -i2 : -1 - ((i1 - 1) / -i2))
: (i1 < 0 ? -1 - ((-1 - i1) / i2) : i1 / i2));
- XSET (arg, Lisp_Int, i1);
+ XSETINT (arg, i1);
return arg;
}
#ifdef LISP_FLOAT_TYPE
- if (XTYPE (arg) == Lisp_Float)
- IN_FLOAT (XSET (arg, Lisp_Int, floor (XFLOAT (arg)->data)), "floor", arg);
+ if (FLOATP (arg))
+ {
+ double d;
+ IN_FLOAT (d = floor (XFLOAT (arg)->data), "floor", arg);
+ FLOAT_TO_INT (d, arg, "floor", arg);
+ }
#endif
return arg;
{
CHECK_NUMBER_OR_FLOAT (arg, 0);
- if (XTYPE (arg) == Lisp_Float)
- /* Screw the prevailing rounding mode. */
- IN_FLOAT (XSET (arg, Lisp_Int, rint (XFLOAT (arg)->data)), "round", arg);
+ if (FLOATP (arg))
+ {
+ double d;
+
+ /* Screw the prevailing rounding mode. */
+ IN_FLOAT (d = rint (XFLOAT (arg)->data), "round", arg);
+ FLOAT_TO_INT (d, arg, "round", arg);
+ }
return arg;
}
{
CHECK_NUMBER_OR_FLOAT (arg, 0);
- if (XTYPE (arg) == Lisp_Float)
- XSET (arg, Lisp_Int, (int) XFLOAT (arg)->data);
+ if (FLOATP (arg))
+ {
+ double d;
+
+ d = XFLOAT (arg)->data;
+ FLOAT_TO_INT (d, arg, "truncate", arg);
+ }
return arg;
}