X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Flow.lisp;h=4ace2055fd1b136f788ea0af8be30cc688d87db6;hb=355e6c09a8f7f528a838f7a50b99ad77811b51a2;hp=1a1be86793ae99c8a15a22d46d90f8b19b9bb519;hpb=970dd272dc84f7420252eadb4829cc193f795716;p=sbcl.git

diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp
index 1a1be86..4ace205 100644
--- a/src/pcl/low.lisp
+++ b/src/pcl/low.lisp
@@ -67,7 +67,6 @@
                       ;; to find out, I just overrode the LAYOUT
                       ;; default here. -- WHN 19991204
                       (invalid nil))
-            (:conc-name %wrapper-)
             (:constructor make-wrapper-internal)
             (:copier nil))
   (instance-slots-layout nil :type list)
@@ -306,11 +305,8 @@
 
 ;;; The definition of STRUCTURE-TYPE-P was moved to early-low.lisp.
 
-(defun get-structure-dd (type)
-  (layout-info (classoid-layout (find-classoid type))))
-
 (defun structure-type-included-type-name (type)
-  (let ((include (dd-include (get-structure-dd type))))
+  (let ((include (dd-include (find-defstruct-description type))))
     (if (consp include)
         (car include)
         include)))
@@ -318,8 +314,8 @@
 (defun structure-type-slot-description-list (type)
   (nthcdr (length (let ((include (structure-type-included-type-name type)))
                     (and include
-                         (dd-slots (get-structure-dd include)))))
-          (dd-slots (get-structure-dd type))))
+                         (dd-slots (find-defstruct-description include)))))
+          (dd-slots (find-defstruct-description type))))
 
 (defun structure-slotd-name (slotd)
   (dsd-name slotd))
@@ -332,7 +328,7 @@
 
 (defun structure-slotd-writer-function (type slotd)
   (if (dsd-read-only slotd)
-      (let ((dd (get-structure-dd type)))
+      (let ((dd (find-defstruct-description type)))
         (coerce (slot-setter-lambda-form dd slotd) 'function))
       (fdefinition `(setf ,(dsd-accessor-name slotd)))))