Fix (floor 54043195528445955 3.0) bug

* src/floatfns.c (rounding_driver): Fix rounding error
that can occur when both args have values exactly
representable as integers but at least one arg is a float.
* test/src/floatfns-tests.el (big-round): New test.

diff --git a/src/floatfns.c b/src/floatfns.c
index 6f5aee2db9d1a66092247b0b51a05db83bf4ff9c..900392575c01c616b0696b4f8f76f49ea0c2fd61 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -332,6 +332,18 @@ This is the same as the exponent of a float.  */)
   return make_fixnum (value);
 }
 
+/* True if A is exactly representable as an integer.  */
+
+static bool
+integer_value (Lisp_Object a)
+{
+  if (FLOATP (a))
+    {
+      double d = XFLOAT_DATA (a);
+      return d == floor (d) && isfinite (d);
+    }
+  return true;
+}
 
 /* the rounding functions  */
 
@@ -353,10 +365,16 @@ rounding_driver (Lisp_Object arg, Lisp_Object divisor,
   else
     {
       CHECK_NUMBER (divisor);
-      if (!FLOATP (arg) && !FLOATP (divisor))
+      if (integer_value (arg) && integer_value (divisor))
        {
          /* Divide as integers.  Converting to double might lose
             info, even for fixnums; also see the FIXME below.  */
+
+         if (FLOATP (arg))
+           arg = double_to_integer (XFLOAT_DATA (arg));
+         if (FLOATP (divisor))
+           divisor = double_to_integer (XFLOAT_DATA (divisor));
+
          if (FIXNUMP (divisor))
            {
              if (XFIXNUM (divisor) == 0)

diff --git a/test/src/floatfns-tests.el b/test/src/floatfns-tests.el
index 3dcddc7f26bd355a90c88d375a76d755e3703d8f..14576b603c0241f1e0c9d36728abf3c749877c43 100644 (file)
--- a/test/src/floatfns-tests.el
+++ b/test/src/floatfns-tests.el
@@ -109,4 +109,8 @@
           (should-error (round n d))
           (should-error (truncate n d)))))))
 
+(ert-deftest big-round ()
+  (should (= (floor 54043195528445955 3)
+             (floor 54043195528445955 3.0))))
+
 (provide 'floatfns-tests)