0.8.20.27:

[sbcl.git] / tests / arith.pure.lisp

diff --git a/tests/arith.pure.lisp b/tests/arith.pure.lisp
index 8d1d12b..3cc17fa 100644 (file)
--- a/tests/arith.pure.lisp
+++ b/tests/arith.pure.lisp
@@ -44,6 +44,10 @@
 (assert (= (coerce 1/2 '(complex float)) #c(0.5 0.0)))
 (assert (= (coerce 1.0d0 '(complex float)) #c(1.0d0 0.0d0)))
 
+;;; (COERCE #c(<RATIONAL> <RATIONAL>) '(complex float)) resulted in
+;;; an error up to 0.8.17.31
+(assert (= (coerce #c(1 2) '(complex float)) #c(1.0 2.0)))
+
 ;;; COERCE also sometimes failed to verify that a particular coercion
 ;;; was possible (in particular coercing rationals to bounded float
 ;;; types.
@@ -147,11 +151,11 @@
             ((1+ most-positive-fixnum) (1+ most-positive-fixnum) nil)
             ((1+ most-positive-fixnum) (1- most-negative-fixnum) t)
             (1 (ash most-negative-fixnum 1) nil)
-            (29 most-negative-fixnum t)
-            (30 (ash most-negative-fixnum 1) t)
-            (31 (ash most-negative-fixnum 1) t)
-            (64 (ash most-negative-fixnum 36) nil)
-            (65 (ash most-negative-fixnum 36) t)))
+            (#.(- sb-vm:n-word-bits sb-vm:n-lowtag-bits) most-negative-fixnum t)
+            (#.(1+ (- sb-vm:n-word-bits sb-vm:n-lowtag-bits)) (ash most-negative-fixnum 1) t)
+            (#.(+ 2 (- sb-vm:n-word-bits sb-vm:n-lowtag-bits)) (ash most-negative-fixnum 1) t)
+            (#.(+ sb-vm:n-word-bits 32) (ash most-negative-fixnum #.(+ 32 sb-vm:n-lowtag-bits 1)) nil)
+            (#.(+ sb-vm:n-word-bits 33) (ash most-negative-fixnum #.(+ 32 sb-vm:n-lowtag-bits 1)) t)))
   (destructuring-bind (index int result) x
     (assert (eq (eval `(logbitp ,index ,int)) result))))
 
@@ -220,3 +224,43 @@
   (frob /)
   (frob floor)
   (frob ceiling))
+
+;; Check that the logic in SB-KERNEL::BASIC-COMPARE for doing fixnum/float
+;; comparisons without rationalizing the floats still gives the right anwers
+;; in the edge cases (had a fencepost error).
+(macrolet ((test (range type sign)
+            `(let (ints
+                   floats
+                   (start (- ,(find-symbol (format nil
+                                                   "MOST-~A-EXACTLY-~A-FIXNUM"
+                                                   sign type)
+                                           :sb-kernel)
+                             ,range)))
+               (dotimes (i (1+ (* ,range 2)))
+                 (let* ((x (+ start i))
+                        (y (coerce x ',type)))
+                   (push x ints)
+                   (push y floats)))
+               (dolist (i ints)
+                 (dolist (f floats)
+                   (dolist (op '(< <= = >= >))
+                     (unless (eq (funcall op i f)
+                                 (funcall op i (rationalize f)))
+                       (error "(not (eq (~a ~a ~f) (~a ~a ~a)))~%"
+                              op i f
+                              op i (rationalize f)))
+                     (unless (eq (funcall op f i)
+                                 (funcall op (rationalize f) i))
+                       (error "(not (eq (~a ~f ~a) (~a ~a ~a)))~%"
+                              op f i
+                              op (rationalize f) i))))))))
+  (test 32 double-float negative)
+  (test 32 double-float positive)
+  (test 32 single-float negative)
+  (test 32 single-float positive))
+
+;; x86-64 sign-extension bug found using pfdietz's random tester.
+(assert (= 286142502
+          (funcall (lambda () 
+                     (declare (notinline logxor)) 
+                     (min (logxor 0 0 0 286142502))))))