X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fbf349734468d48b421c3d03074bb66dfcf3115b..32655809a8c9c9a8382996cf553660c33b66c693:/src/floatfns.c
diff --git a/src/floatfns.c b/src/floatfns.c
index 79574e0a69..d454d6e3cf 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,13 +1,13 @@
/* Primitive operations on floating point for GNU Emacs Lisp interpreter.
- Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
- 2005 Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 1999, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
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
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
/* ANSI C requires only these float functions:
@@ -64,16 +62,6 @@ Boston, MA 02110-1301, USA. */
#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
/* This declaration is omitted on some systems, like Ultrix. */
@@ -113,16 +101,6 @@ extern int errno;
#endif
#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
@@ -201,17 +179,15 @@ static char *float_error_fn_name;
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. */
@@ -456,7 +432,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
(arg1, arg2)
register Lisp_Object arg1, arg2;
{
- double f1, f2;
+ double f1, f2, f3;
CHECK_NUMBER_OR_FLOAT (arg1);
CHECK_NUMBER_OR_FLOAT (arg2);
@@ -502,13 +478,16 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
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,
doc: /* Return the natural logarithm of ARG.
-If second optional argument BASE is given, return log ARG using that base. */)
+If the optional argument BASE is given, return log ARG using that base. */)
(arg, base)
register Lisp_Object arg, base;
{
@@ -756,7 +735,7 @@ rounding_driver (arg, divisor, double_round, int_round2, name)
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);
@@ -767,7 +746,7 @@ rounding_driver (arg, divisor, double_round, int_round2, name)
i2 = XINT (divisor);
if (i2 == 0)
- Fsignal (Qarith_error, Qnil);
+ xsignal0 (Qarith_error);
XSETINT (arg, (*int_round2) (i1, i2));
return arg;
@@ -907,7 +886,7 @@ fmod_float (x, y)
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),
@@ -973,11 +952,7 @@ float_error (signo)
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);
@@ -986,7 +961,7 @@ float_error (signo)
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'
@@ -1014,11 +989,11 @@ matherr (x)
: 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 */
}