X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Firrat.lisp;h=c4e9ad46387daaf3b3f2b13a16cee2efb1e2493e;hb=8fe977ca5d0d068f2641dd06d3743a4c218d5cc1;hp=65c96f152a6ebb8277b7ac799f0747791eb0e60d;hpb=9dcd91eba92f6f2db9ae65d7640f2cd2f4ee2a8b;p=sbcl.git

diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp
index 65c96f1..c4e9ad4 100644
--- a/src/code/irrat.lisp
+++ b/src/code/irrat.lisp
@@ -335,11 +335,20 @@
   "Return the logarithm of NUMBER in the base BASE, which defaults to e."
   (if base-p
       (cond
-        ((zerop base) 0f0) ; FIXME: type
+        ((zerop base)
+         (if (or (typep number 'double-float) (typep base 'double-float))
+             0.0d0
+             0.0f0))
         ((and (typep number '(integer (0) *))
               (typep base '(integer (0) *)))
          (coerce (/ (log2 number) (log2 base)) 'single-float))
-        (t (/ (log number) (log base))))
+        ((and (typep number 'integer) (typep base 'double-float))
+         ;; No single float intermediate result
+         (/ (log2 number) (log base 2.0d0)))
+        ((and (typep number 'double-float) (typep base 'integer))
+         (/ (log number 2.0d0) (log2 base)))
+        (t
+         (/ (log number) (log base))))
       (number-dispatch ((number number))
         (((foreach fixnum bignum))
          (if (minusp number)