0.8alpha.0.19

[sbcl.git] / src / code / pred.lisp

diff --git a/src/code/pred.lisp b/src/code/pred.lisp
index 400c42b..dd6ccb2 100644 (file)
--- a/src/code/pred.lisp
+++ b/src/code/pred.lisp
@@ -115,8 +115,8 @@
   "Return the type of OBJECT."
   (if (typep object '(or function array complex))
     (type-specifier (ctype-of object))
-    (let* ((class (layout-class (layout-of object)))
-          (name (class-name class)))
+    (let* ((classoid (layout-classoid (layout-of object)))
+          (name (classoid-name classoid)))
       (if (typep object 'instance)
       (case name
        (sb!alien-internals:alien-value
@@ -124,7 +124,7 @@
           ,(sb!alien-internals:unparse-alien-type
             (sb!alien-internals:alien-value-type object))))
        (t
-        (class-proper-name class)))
+        (classoid-proper-name classoid)))
       name))))
 \f
 ;;;; equality predicates
@@ -209,7 +209,7 @@
                (len (layout-length layout-x)))
           (and (typep y 'instance)
                (eq layout-x (%instance-layout y))
-               (structure-class-p (layout-class layout-x))
+               (structure-classoid-p (layout-classoid layout-x))
                (do ((i 1 (1+ i)))
                    ((= i len) t)
                  (declare (fixnum i))
@@ -245,7 +245,7 @@
 
 (/show0 "about to do test cases in pred.lisp")
 #!+sb-test
-(let ((test-cases '((0.0 -0.0 t)
+(let ((test-cases `((0.0 ,(load-time-value (make-unportable-float :single-float-negative-zero)) t)
                    (0.0 1.0 nil)
                    (#c(1 0) #c(1.0 0) t)
                    (#c(1.1 0) #c(11/10 0) nil) ; due to roundoff error