0.pre7.98:

[sbcl.git] / src / pcl / defclass.lisp

diff --git a/src/pcl/defclass.lisp b/src/pcl/defclass.lisp
index a608ddc..845edaf 100644 (file)
--- a/src/pcl/defclass.lisp
+++ b/src/pcl/defclass.lisp
@@ -109,9 +109,8 @@
                                        (fix-super (car supers)))
                                   (and (not (eq name 'structure-object))
                                        *the-class-structure-object*)))
-                     (defstruct-form (make-structure-class-defstruct-form name
-                                                                          slots
-                                                                          include)))
+                     (defstruct-form (make-structure-class-defstruct-form
+                                     name slots include)))
                 `(progn
                   (eval-when (:compile-toplevel :load-toplevel :execute)
                     ,defstruct-form) ; really compile the defstruct-form
@@ -275,10 +274,11 @@
     (values (early-collect-slots cpl)
            cpl
            (early-collect-default-initargs cpl)
-           (gathering1 (collecting)
+           (let (collect)
              (dolist (definition *early-class-definitions*)
                (when (memq class-name (ecd-superclass-names definition))
-                 (gather1 (ecd-class-name definition))))))))
+                 (push (ecd-class-name definition) collect)))
+              (nreverse collect)))))
 
 (defun early-collect-slots (cpl)
   (let* ((definitions (mapcar #'early-class-definition cpl))