X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsharpm.lisp;h=6615bb92b7e572284d495715a36f9bdeb6b70ec1;hb=d656401927393487e28e1b765f868822370c1be3;hp=273a6a6004ca2081a52e2fa7f96a604b69167e12;hpb=80cee3cf18d09202aa30ab957e08c5759e573bbe;p=sbcl.git

diff --git a/src/code/sharpm.lisp b/src/code/sharpm.lisp
index 273a6a6..6615bb9 100644
--- a/src/code/sharpm.lisp
+++ b/src/code/sharpm.lisp
@@ -119,13 +119,13 @@
       (%reader-error stream "non-list following #S: ~S" body))
     (unless (symbolp (car body))
       (%reader-error stream "Structure type is not a symbol: ~S" (car body)))
-    (let ((class (sb!xc:find-class (car body) nil)))
-      (unless (typep class 'sb!xc:structure-class)
+    (let ((classoid (find-classoid (car body) nil)))
+      (unless (typep classoid 'structure-classoid)
 	(%reader-error stream "~S is not a defined structure type."
 		       (car body)))
       (let ((def-con (dd-default-constructor
 		      (layout-info
-		       (class-layout class)))))
+		       (classoid-layout classoid)))))
 	(unless def-con
 	  (%reader-error
 	   stream "The ~S structure does not have a default constructor."
@@ -184,12 +184,12 @@
 ;; substitutes in arrays and structures as well as lists. The first arg is an
 ;; alist of the things to be replaced assoc'd with the things to replace them.
 (defun circle-subst (old-new-alist tree)
-  (cond ((not (typep tree '(or cons (array t) structure-object)))
+  (cond ((not (typep tree '(or cons (array t) structure-object standard-object)))
 	 (let ((entry (find tree old-new-alist :key #'second)))
 	   (if entry (third entry) tree)))
 	((null (gethash tree *sharp-equal-circle-table*))
 	 (setf (gethash tree *sharp-equal-circle-table*) t)
-	 (cond ((typep tree 'structure-object)
+	 (cond ((typep tree '(or structure-object standard-object))
 		(do ((i 1 (1+ i))
 		     (end (%instance-length tree)))
 		    ((= i end))