/* Primitive operations on floating point for GNU Emacs Lisp interpreter.
- Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
+
+Copyright (C) 1988, 1993-1994, 1999, 2001-2011
+ Free Software Foundation, Inc.
+
+Author: Wolfgang Rupprecht
+(according to ack.texi)
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* ANSI C requires only these float functions:
a domain error occurs.)
*/
-#include <signal.h>
-
#include <config.h>
+#include <signal.h>
+#include <setjmp.h>
#include "lisp.h"
#include "syssignal.h"
-#ifdef LISP_FLOAT_TYPE
-
#if STDC_HEADERS
#include <float.h>
#endif
#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,
- because `static' is defined as nothing. The problem is that they are
- defined both here and in lread.c.
- These macros prevent the name conflict. */
-#if defined (HPUX) && !defined (HPUX8)
-#define _MAXLDBL floatfns_maxldbl
-#define _NMAXLDBL floatfns_nmaxldbl
-#endif
-
#include <math.h>
/* This declaration is omitted on some systems, like Ultrix. */
#if !defined (HPUX) && defined (HAVE_LOGB) && !defined (logb)
-extern double logb ();
+extern double logb (double);
#endif /* not HPUX and HAVE_LOGB and no logb macro */
#if defined(DOMAIN) && defined(SING) && defined(OVERFLOW)
#ifdef FLOAT_CHECK_ERRNO
# include <errno.h>
-
-extern int errno;
#endif
-/* Avoid traps on VMS from sinh and cosh.
- All the other functions set errno instead. */
-
-#ifdef VMS
-#undef cosh
-#undef sinh
-#define cosh(x) ((exp(x)+exp(-x))*0.5)
-#define sinh(x) ((exp(x)-exp(-x))*0.5)
-#endif /* VMS */
-
+#ifdef FLOAT_CATCH_SIGILL
static SIGTYPE float_error ();
+#endif
/* Nonzero while executing in floating point.
This tells float_error what to do. */
static Lisp_Object float_error_arg, float_error_arg2;
-static char *float_error_fn_name;
+static const char *float_error_fn_name;
/* Evaluate the floating point expression D, recording NUM
as the original argument for error messages.
#define FLOAT_TO_INT(x, i, name, num) \
do \
{ \
- if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \
- (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \
+ if (FIXNUM_OVERFLOW_P (x)) \
range_error (name, num); \
XSETINT (i, (EMACS_INT)(x)); \
} \
#define FLOAT_TO_INT2(x, i, name, num1, num2) \
do \
{ \
- if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \
- (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \
+ if (FIXNUM_OVERFLOW_P (x)) \
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)))
+ xsignal2 (Qarith_error, build_string ((op)), (arg))
#define range_error(op,arg) \
- Fsignal (Qrange_error, Fcons (build_string ((op)), Fcons ((arg), Qnil)))
+ xsignal2 (Qrange_error, build_string ((op)), (arg))
#define range_error2(op,a1,a2) \
- Fsignal (Qrange_error, Fcons (build_string ((op)), \
- Fcons ((a1), Fcons ((a2), Qnil))))
+ xsignal3 (Qrange_error, build_string ((op)), (a1), (a2))
#define domain_error(op,arg) \
- Fsignal (Qdomain_error, Fcons (build_string ((op)), Fcons ((arg), Qnil)))
+ xsignal2 (Qdomain_error, build_string ((op)), (arg))
#define domain_error2(op,a1,a2) \
- Fsignal (Qdomain_error, Fcons (build_string ((op)), \
- Fcons ((a1), Fcons ((a2), Qnil))))
+ xsignal3 (Qdomain_error, build_string ((op)), (a1), (a2))
/* Extract a Lisp number as a `double', or signal an error. */
double
-extract_float (num)
- Lisp_Object num;
+extract_float (Lisp_Object num)
{
- CHECK_NUMBER_OR_FLOAT (num, 0);
+ CHECK_NUMBER_OR_FLOAT (num);
if (FLOATP (num))
return XFLOAT_DATA (num);
/* Trig functions. */
DEFUN ("acos", Facos, Sacos, 1, 1, 0,
- "Return the inverse cosine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the inverse cosine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("asin", Fasin, Sasin, 1, 1, 0,
- "Return the inverse sine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the inverse sine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
return make_float (d);
}
-DEFUN ("atan", Fatan, Satan, 1, 1, 0,
- "Return the inverse tangent of ARG.")
- (arg)
- register Lisp_Object arg;
+DEFUN ("atan", Fatan, Satan, 1, 2, 0,
+ doc: /* Return the inverse tangent of the arguments.
+If only one argument Y is given, return the inverse tangent of Y.
+If two arguments Y and X are given, return the inverse tangent of Y
+divided by X, i.e. the angle in radians between the vector (X, Y)
+and the x-axis. */)
+ (register Lisp_Object y, Lisp_Object x)
{
- double d = extract_float (arg);
- IN_FLOAT (d = atan (d), "atan", arg);
+ double d = extract_float (y);
+
+ if (NILP (x))
+ IN_FLOAT (d = atan (d), "atan", y);
+ else
+ {
+ double d2 = extract_float (x);
+
+ IN_FLOAT2 (d = atan2 (d, d2), "atan", y, x);
+ }
return make_float (d);
}
DEFUN ("cos", Fcos, Scos, 1, 1, 0,
- "Return the cosine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the cosine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = cos (d), "cos", arg);
}
DEFUN ("sin", Fsin, Ssin, 1, 1, 0,
- "Return the sine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the sine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = sin (d), "sin", arg);
}
DEFUN ("tan", Ftan, Stan, 1, 1, 0,
- "Return the tangent of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the tangent of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
double c = cos (d);
IN_FLOAT (d = sin (d) / c, "tan", arg);
return make_float (d);
}
+
+#if defined HAVE_ISNAN && defined HAVE_COPYSIGN
+DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0,
+ doc: /* Return non nil iff argument X is a NaN. */)
+ (Lisp_Object x)
+{
+ CHECK_FLOAT (x);
+ return isnan (XFLOAT_DATA (x)) ? Qt : Qnil;
+}
+
+DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0,
+ doc: /* Copy sign of X2 to value of X1, and return the result.
+Cause an error if X1 or X2 is not a float. */)
+ (Lisp_Object x1, Lisp_Object x2)
+{
+ double f1, f2;
+
+ CHECK_FLOAT (x1);
+ CHECK_FLOAT (x2);
+
+ f1 = XFLOAT_DATA (x1);
+ f2 = XFLOAT_DATA (x2);
+
+ return make_float (copysign (f1, f2));
+}
+
+DEFUN ("frexp", Ffrexp, Sfrexp, 1, 1, 0,
+ doc: /* Get significand and exponent of a floating point number.
+Breaks the floating point number X into its binary significand SGNFCAND
+\(a floating point value between 0.5 (included) and 1.0 (excluded))
+and an integral exponent EXP for 2, such that:
+
+ X = SGNFCAND * 2^EXP
+
+The function returns the cons cell (SGNFCAND . EXP).
+If X is zero, both parts (SGNFCAND and EXP) are zero. */)
+ (Lisp_Object x)
+{
+ double f = XFLOATINT (x);
+
+ if (f == 0.0)
+ return Fcons (make_float (0.0), make_number (0));
+ else
+ {
+ int exp;
+ double sgnfcand = frexp (f, &exp);
+ return Fcons (make_float (sgnfcand), make_number (exp));
+ }
+}
+
+DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0,
+ doc: /* Construct number X from significand SGNFCAND and exponent EXP.
+Returns the floating point value resulting from multiplying SGNFCAND
+(the significand) by 2 raised to the power of EXP (the exponent). */)
+ (Lisp_Object sgnfcand, Lisp_Object exp)
+{
+ CHECK_NUMBER (exp);
+ return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exp)));
+}
+#endif
\f
#if 0 /* Leave these out unless we find there's a reason for them. */
DEFUN ("bessel-j0", Fbessel_j0, Sbessel_j0, 1, 1, 0,
- "Return the bessel function j0 of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the bessel function j0 of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = j0 (d), "bessel-j0", arg);
}
DEFUN ("bessel-j1", Fbessel_j1, Sbessel_j1, 1, 1, 0,
- "Return the bessel function j1 of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the bessel function j1 of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = j1 (d), "bessel-j1", arg);
}
DEFUN ("bessel-jn", Fbessel_jn, Sbessel_jn, 2, 2, 0,
- "Return the order N bessel function output jn of ARG.\n\
-The first arg (the order) is truncated to an integer.")
- (n, arg)
- register Lisp_Object n, arg;
+ doc: /* Return the order N bessel function output jn of ARG.
+The first arg (the order) is truncated to an integer. */)
+ (register Lisp_Object n, Lisp_Object arg)
{
int i1 = extract_float (n);
double f2 = extract_float (arg);
}
DEFUN ("bessel-y0", Fbessel_y0, Sbessel_y0, 1, 1, 0,
- "Return the bessel function y0 of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the bessel function y0 of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = y0 (d), "bessel-y0", arg);
}
DEFUN ("bessel-y1", Fbessel_y1, Sbessel_y1, 1, 1, 0,
- "Return the bessel function y1 of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the bessel function y1 of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = y1 (d), "bessel-y0", arg);
}
DEFUN ("bessel-yn", Fbessel_yn, Sbessel_yn, 2, 2, 0,
- "Return the order N bessel function output yn of ARG.\n\
-The first arg (the order) is truncated to an integer.")
- (n, arg)
- register Lisp_Object n, arg;
+ doc: /* Return the order N bessel function output yn of ARG.
+The first arg (the order) is truncated to an integer. */)
+ (register Lisp_Object n, Lisp_Object arg)
{
int i1 = extract_float (n);
double f2 = extract_float (arg);
#if 0 /* Leave these out unless we see they are worth having. */
DEFUN ("erf", Ferf, Serf, 1, 1, 0,
- "Return the mathematical error function of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the mathematical error function of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = erf (d), "erf", arg);
}
DEFUN ("erfc", Ferfc, Serfc, 1, 1, 0,
- "Return the complementary error function of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the complementary error function of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = erfc (d), "erfc", arg);
}
DEFUN ("log-gamma", Flog_gamma, Slog_gamma, 1, 1, 0,
- "Return the log gamma of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the log gamma of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = lgamma (d), "log-gamma", arg);
}
DEFUN ("cube-root", Fcube_root, Scube_root, 1, 1, 0,
- "Return the cube root of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the cube root of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef HAVE_CBRT
#endif
\f
DEFUN ("exp", Fexp, Sexp, 1, 1, 0,
- "Return the exponential base e of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the exponential base e of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
- "Return the exponential ARG1 ** ARG2.")
- (arg1, arg2)
- register Lisp_Object arg1, arg2;
+ doc: /* Return the exponential ARG1 ** ARG2. */)
+ (register Lisp_Object arg1, Lisp_Object arg2)
{
- double f1, f2;
+ double f1, f2, f3;
- CHECK_NUMBER_OR_FLOAT (arg1, 0);
- CHECK_NUMBER_OR_FLOAT (arg2, 0);
+ CHECK_NUMBER_OR_FLOAT (arg1);
+ CHECK_NUMBER_OR_FLOAT (arg2);
if (INTEGERP (arg1) /* common lisp spec */
- && INTEGERP (arg2)) /* don't promote, if both are ints */
+ && INTEGERP (arg2) /* don't promote, if both are ints, and */
+ && 0 <= XINT (arg2)) /* we are sure the result is not fractional */
{ /* this can be improved by pre-calculating */
EMACS_INT acc, x, y; /* some binary powers of x then accumulating */
Lisp_Object val;
x = XINT (arg1);
y = XINT (arg2);
acc = 1;
-
+
if (y < 0)
{
if (x == 1)
else if ((f1 == 0.0 && f2 < 0.0) || (f1 < 0 && f2 != floor(f2)))
domain_error2 ("expt", arg1, arg2);
#endif
- IN_FLOAT2 (f1 = pow (f1, f2), "expt", arg1, arg2);
- return make_float (f1);
+ IN_FLOAT2 (f3 = pow (f1, f2), "expt", arg1, arg2);
+ /* Check for overflow in the result. */
+ if (f1 != 0.0 && f3 == 0.0)
+ range_error ("expt", arg1);
+ return make_float (f3);
}
DEFUN ("log", Flog, Slog, 1, 2, 0,
- "Return the natural logarithm of ARG.\n\
-If second optional argument BASE is given, return log ARG using that base.")
- (arg, base)
- register Lisp_Object arg, base;
+ doc: /* Return the natural logarithm of ARG.
+If the optional argument BASE is given, return log ARG using that base. */)
+ (register Lisp_Object arg, Lisp_Object base)
{
double d = extract_float (arg);
}
DEFUN ("log10", Flog10, Slog10, 1, 1, 0,
- "Return the logarithm base 10 of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the logarithm base 10 of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("sqrt", Fsqrt, Ssqrt, 1, 1, 0,
- "Return the square root of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the square root of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
#if 0 /* Not clearly worth adding. */
DEFUN ("acosh", Facosh, Sacosh, 1, 1, 0,
- "Return the inverse hyperbolic cosine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the inverse hyperbolic cosine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("asinh", Fasinh, Sasinh, 1, 1, 0,
- "Return the inverse hyperbolic sine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the inverse hyperbolic sine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef HAVE_INVERSE_HYPERBOLIC
}
DEFUN ("atanh", Fatanh, Satanh, 1, 1, 0,
- "Return the inverse hyperbolic tangent of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the inverse hyperbolic tangent of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("cosh", Fcosh, Scosh, 1, 1, 0,
- "Return the hyperbolic cosine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the hyperbolic cosine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("sinh", Fsinh, Ssinh, 1, 1, 0,
- "Return the hyperbolic sine of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the hyperbolic sine of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
#ifdef FLOAT_CHECK_DOMAIN
}
DEFUN ("tanh", Ftanh, Stanh, 1, 1, 0,
- "Return the hyperbolic tangent of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the hyperbolic tangent of ARG. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = tanh (d), "tanh", arg);
#endif
\f
DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
- "Return the absolute value of ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the absolute value of ARG. */)
+ (register Lisp_Object arg)
{
- CHECK_NUMBER_OR_FLOAT (arg, 0);
+ CHECK_NUMBER_OR_FLOAT (arg);
if (FLOATP (arg))
IN_FLOAT (arg = make_float (fabs (XFLOAT_DATA (arg))), "abs", arg);
}
DEFUN ("float", Ffloat, Sfloat, 1, 1, 0,
- "Return the floating point number equal to ARG.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the floating point number equal to ARG. */)
+ (register Lisp_Object arg)
{
- CHECK_NUMBER_OR_FLOAT (arg, 0);
+ CHECK_NUMBER_OR_FLOAT (arg);
if (INTEGERP (arg))
return make_float ((double) XINT (arg));
}
DEFUN ("logb", Flogb, Slogb, 1, 1, 0,
- "Returns largest integer <= the base 2 log of the magnitude of ARG.\n\
-This is the same as the exponent of a float.")
- (arg)
- Lisp_Object arg;
+ doc: /* Returns largest integer <= the base 2 log of the magnitude of ARG.
+This is the same as the exponent of a float. */)
+ (Lisp_Object arg)
{
Lisp_Object val;
EMACS_INT value;
double f = extract_float (arg);
if (f == 0.0)
- value = -(VALMASK >> 1);
+ value = MOST_NEGATIVE_FIXNUM;
else
{
#ifdef HAVE_LOGB
return val;
}
-#endif /* LISP_FLOAT_TYPE */
-
/* the rounding functions */
static Lisp_Object
-rounding_driver (arg, divisor, double_round, int_round2, name)
- register Lisp_Object arg, divisor;
- double (*double_round) ();
- EMACS_INT (*int_round2) ();
- char *name;
+rounding_driver (Lisp_Object arg, Lisp_Object divisor,
+ double (*double_round) (double),
+ EMACS_INT (*int_round2) (EMACS_INT, EMACS_INT),
+ const char *name)
{
- CHECK_NUMBER_OR_FLOAT (arg, 0);
+ CHECK_NUMBER_OR_FLOAT (arg);
if (! NILP (divisor))
{
EMACS_INT i1, i2;
- CHECK_NUMBER_OR_FLOAT (divisor, 1);
+ CHECK_NUMBER_OR_FLOAT (divisor);
-#ifdef LISP_FLOAT_TYPE
if (FLOATP (arg) || FLOATP (divisor))
{
double f1, f2;
f1 = FLOATP (arg) ? XFLOAT_DATA (arg) : XINT (arg);
f2 = (FLOATP (divisor) ? XFLOAT_DATA (divisor) : XINT (divisor));
if (! IEEE_FLOATING_POINT && f2 == 0)
- Fsignal (Qarith_error, Qnil);
+ xsignal0 (Qarith_error);
IN_FLOAT2 (f1 = (*double_round) (f1 / f2), name, arg, divisor);
FLOAT_TO_INT2 (f1, arg, name, arg, divisor);
return arg;
}
-#endif
i1 = XINT (arg);
i2 = XINT (divisor);
if (i2 == 0)
- Fsignal (Qarith_error, Qnil);
+ xsignal0 (Qarith_error);
XSETINT (arg, (*int_round2) (i1, i2));
return arg;
}
-#ifdef LISP_FLOAT_TYPE
if (FLOATP (arg))
{
double d;
IN_FLOAT (d = (*double_round) (XFLOAT_DATA (arg)), name, arg);
FLOAT_TO_INT (d, arg, name, arg);
}
-#endif
return arg;
}
integer functions. */
static EMACS_INT
-ceiling2 (i1, i2)
- EMACS_INT i1, i2;
+ceiling2 (EMACS_INT i1, EMACS_INT i2)
{
return (i2 < 0
? (i1 < 0 ? ((-1 - i1) / -i2) + 1 : - (i1 / -i2))
}
static EMACS_INT
-floor2 (i1, i2)
- EMACS_INT i1, i2;
+floor2 (EMACS_INT i1, EMACS_INT i2)
{
return (i2 < 0
? (i1 <= 0 ? -i1 / -i2 : -1 - ((i1 - 1) / -i2))
}
static EMACS_INT
-truncate2 (i1, i2)
- EMACS_INT i1, i2;
+truncate2 (EMACS_INT i1, EMACS_INT i2)
{
return (i2 < 0
? (i1 < 0 ? -i1 / -i2 : - (i1 / -i2))
}
static EMACS_INT
-round2 (i1, i2)
- EMACS_INT i1, i2;
+round2 (EMACS_INT i1, EMACS_INT i2)
{
/* The C language's division operator gives us one remainder R, but
we want the remainder R1 on the other side of 0 if R1 is closer
#define emacs_rint rint
#else
static double
-emacs_rint (d)
- double d;
+emacs_rint (double d)
{
return floor (d + 0.5);
}
#endif
static double
-double_identity (d)
- double d;
+double_identity (double d)
{
return d;
}
DEFUN ("ceiling", Fceiling, Sceiling, 1, 2, 0,
- "Return the smallest integer no less than ARG. (Round toward +inf.)\n\
-With optional DIVISOR, return the smallest integer no less than ARG/DIVISOR.")
- (arg, divisor)
- Lisp_Object arg, divisor;
+ doc: /* Return the smallest integer no less than ARG.
+This rounds the value towards +inf.
+With optional DIVISOR, return the smallest integer no less than ARG/DIVISOR. */)
+ (Lisp_Object arg, Lisp_Object divisor)
{
return rounding_driver (arg, divisor, ceil, ceiling2, "ceiling");
}
DEFUN ("floor", Ffloor, Sfloor, 1, 2, 0,
- "Return the largest integer no greater than ARG. (Round towards -inf.)\n\
-With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR.")
- (arg, divisor)
- Lisp_Object arg, divisor;
+ doc: /* Return the largest integer no greater than ARG.
+This rounds the value towards -inf.
+With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR. */)
+ (Lisp_Object arg, Lisp_Object divisor)
{
return rounding_driver (arg, divisor, floor, floor2, "floor");
}
DEFUN ("round", Fround, Sround, 1, 2, 0,
- "Return the nearest integer to ARG.\n\
-With optional DIVISOR, return the nearest integer to ARG/DIVISOR.")
- (arg, divisor)
- Lisp_Object arg, divisor;
+ doc: /* Return the nearest integer to ARG.
+With optional DIVISOR, return the nearest integer to ARG/DIVISOR.
+
+Rounding a value equidistant between two integers may choose the
+integer closer to zero, or it may prefer an even integer, depending on
+your machine. For example, \(round 2.5\) can return 3 on some
+systems, but 2 on others. */)
+ (Lisp_Object arg, Lisp_Object divisor)
{
return rounding_driver (arg, divisor, emacs_rint, round2, "round");
}
DEFUN ("truncate", Ftruncate, Struncate, 1, 2, 0,
- "Truncate a floating point number to an int.\n\
-Rounds ARG toward zero.\n\
-With optional DIVISOR, truncate ARG/DIVISOR.")
- (arg, divisor)
- Lisp_Object arg, divisor;
+ doc: /* Truncate a floating point number to an int.
+Rounds ARG toward zero.
+With optional DIVISOR, truncate ARG/DIVISOR. */)
+ (Lisp_Object arg, Lisp_Object divisor)
{
return rounding_driver (arg, divisor, double_identity, truncate2,
"truncate");
}
-#ifdef LISP_FLOAT_TYPE
Lisp_Object
-fmod_float (x, y)
- register Lisp_Object x, y;
+fmod_float (Lisp_Object x, Lisp_Object y)
{
double f1, f2;
f2 = FLOATP (y) ? XFLOAT_DATA (y) : XINT (y);
if (! IEEE_FLOATING_POINT && f2 == 0)
- Fsignal (Qarith_error, Qnil);
+ xsignal0 (Qarith_error);
/* If the "remainder" comes out with the wrong sign, fix it. */
IN_FLOAT2 ((f1 = fmod (f1, f2),
/* It's not clear these are worth adding. */
DEFUN ("fceiling", Ffceiling, Sfceiling, 1, 1, 0,
- "Return the smallest integer no less than ARG, as a float.\n\
-\(Round toward +inf.\)")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the smallest integer no less than ARG, as a float.
+\(Round toward +inf.\) */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = ceil (d), "fceiling", arg);
}
DEFUN ("ffloor", Fffloor, Sffloor, 1, 1, 0,
- "Return the largest integer no greater than ARG, as a float.\n\
-\(Round towards -inf.\)")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the largest integer no greater than ARG, as a float.
+\(Round towards -inf.\) */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = floor (d), "ffloor", arg);
}
DEFUN ("fround", Ffround, Sfround, 1, 1, 0,
- "Return the nearest integer to ARG, as a float.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Return the nearest integer to ARG, as a float. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
IN_FLOAT (d = emacs_rint (d), "fround", arg);
}
DEFUN ("ftruncate", Fftruncate, Sftruncate, 1, 1, 0,
- "Truncate a floating point number to an integral float value.\n\
-Rounds the value toward zero.")
- (arg)
- register Lisp_Object arg;
+ doc: /* Truncate a floating point number to an integral float value.
+Rounds the value toward zero. */)
+ (register Lisp_Object arg)
{
double d = extract_float (arg);
if (d >= 0.0)
fatal_error_signal (signo);
#ifdef BSD_SYSTEM
-#ifdef BSD4_1
- sigrelse (SIGILL);
-#else /* not BSD4_1 */
sigsetmask (SIGEMPTYMASK);
-#endif /* not BSD4_1 */
#else
/* Must reestablish handler each time it is called. */
signal (SIGILL, float_error);
#endif /* BSD_SYSTEM */
+ SIGNAL_THREAD_CHECK (signo);
in_float = 0;
- Fsignal (Qarith_error, Fcons (float_error_arg, Qnil));
+ xsignal1 (Qarith_error, float_error_arg);
}
/* Another idea was to replace the library function `infnan'
#endif /* FLOAT_CATCH_SIGILL */
#ifdef HAVE_MATHERR
-int
-matherr (x)
- struct exception *x;
+int
+matherr (struct exception *x)
{
Lisp_Object args;
+ const char *name = x->name;
+
if (! in_float)
/* Not called from emacs-lisp float routines; do the default thing. */
return 0;
if (!strcmp (x->name, "pow"))
- x->name = "expt";
+ name = "expt";
args
- = Fcons (build_string (x->name),
+ = Fcons (build_string (name),
Fcons (make_float (x->arg1),
- ((!strcmp (x->name, "log") || !strcmp (x->name, "pow"))
+ ((!strcmp (name, "log") || !strcmp (name, "pow"))
? Fcons (make_float (x->arg2), Qnil)
: Qnil)));
switch (x->type)
{
- case DOMAIN: Fsignal (Qdomain_error, args); break;
- case SING: Fsignal (Qsingularity_error, args); break;
- case OVERFLOW: Fsignal (Qoverflow_error, args); break;
- case UNDERFLOW: Fsignal (Qunderflow_error, args); break;
- default: Fsignal (Qarith_error, args); break;
+ case DOMAIN: xsignal (Qdomain_error, args); break;
+ case SING: xsignal (Qsingularity_error, args); break;
+ case OVERFLOW: xsignal (Qoverflow_error, args); break;
+ case UNDERFLOW: xsignal (Qunderflow_error, args); break;
+ default: xsignal (Qarith_error, args); break;
}
return (1); /* don't set errno or print a message */
}
#endif /* HAVE_MATHERR */
void
-init_floatfns ()
+init_floatfns (void)
{
#ifdef FLOAT_CATCH_SIGILL
signal (SIGILL, float_error);
-#endif
+#endif
in_float = 0;
}
-#else /* not LISP_FLOAT_TYPE */
-
-init_floatfns ()
-{}
-
-#endif /* not LISP_FLOAT_TYPE */
-
void
-syms_of_floatfns ()
+syms_of_floatfns (void)
{
-#ifdef LISP_FLOAT_TYPE
defsubr (&Sacos);
defsubr (&Sasin);
defsubr (&Satan);
defsubr (&Scos);
defsubr (&Ssin);
defsubr (&Stan);
+#if defined HAVE_ISNAN && defined HAVE_COPYSIGN
+ defsubr (&Sisnan);
+ defsubr (&Scopysign);
+ defsubr (&Sfrexp);
+ defsubr (&Sldexp);
+#endif
#if 0
defsubr (&Sacosh);
defsubr (&Sasinh);
defsubr (&Sabs);
defsubr (&Sfloat);
defsubr (&Slogb);
-#endif /* LISP_FLOAT_TYPE */
defsubr (&Sceiling);
defsubr (&Sfloor);
defsubr (&Sround);
defsubr (&Struncate);
}
+
HCoop / bpt / emacs.git / blobdiff