X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=6b08ed17002cb110cd7d045f86dcf69aba27f013;hb=a3ab89c1db0dd9bfb911532ca134be16f16c4c1b;hp=9198f0981860f4a1d16d1a417bff0c83b27ecbe1;hpb=7ffdb2f586bf545334b64e639e9e78c30c2063d6;p=sbcl.git

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 9198f09..6b08ed1 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -294,6 +294,22 @@
       (set-slot 'direct-slots direct-slots)
       (set-slot 'slots slots)
       (set-slot 'initialize-info nil))
+
+    ;; For all direct superclasses SUPER of CLASS, make sure CLASS is
+    ;; a direct subclass of SUPER.  Note that METACLASS-NAME doesn't
+    ;; matter here for the slot DIRECT-SUBCLASSES, since every class
+    ;; inherits the slot from class CLASS.
+    (dolist (super direct-supers)
+      (let* ((super (find-class super))
+	     (subclasses (!bootstrap-get-slot metaclass-name super
+					      'direct-subclasses)))
+	(cond ((eq +slot-unbound+ subclasses)
+	       (!bootstrap-set-slot metaclass-name super 'direct-subclasses
+				    (list class)))
+	      ((not (memq class subclasses))
+	       (!bootstrap-set-slot metaclass-name super 'direct-subclasses
+				    (cons class subclasses))))))
+
     (if (eq metaclass-name 'structure-class)
 	(let ((constructor-sym '|STRUCTURE-OBJECT class constructor|))
 	  (set-slot 'predicate-name (or (cadr (assoc name
@@ -380,9 +396,9 @@
 		(!bootstrap-accessor-definitions1
 		 'slot-object
 		 slot-name
-		 (list (slot-reader-symbol slot-name))
-		 (list (slot-writer-symbol slot-name))
-		 (list (slot-boundp-symbol slot-name)))))))))))
+		 (list (slot-reader-name slot-name))
+		 (list (slot-writer-name slot-name))
+		 (list (slot-boundp-name slot-name)))))))))))
 
 (defun !bootstrap-accessor-definition (class-name accessor-name slot-name type)
   (multiple-value-bind (accessor-class make-method-function arglist specls doc)