X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpred.lisp;h=78a51c2a5951bcd2a0a610c76a73260d4a71b587;hb=8b78dfb8dc6c72c73a9c1732f0869e3f02281519;hp=400c42b0bb0f4d3e91e23c6075b95aa031a957db;hpb=8fb02633217a721b85487531709779f338d02438;p=sbcl.git

diff --git a/src/code/pred.lisp b/src/code/pred.lisp
index 400c42b..78a51c2 100644
--- 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))))
 
 ;;;; 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))