X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fbraid.lisp;h=6bed8f493071956465d1c5ec8be45c9934438ca1;hb=1363121ddb1d2e722e2e41d1c93758551066797c;hp=9955583fd186a37a17e6d05dbeed6eaf198be09c;hpb=31f072311935e32751508ecf824905c6b58a1d95;p=sbcl.git

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 9955583..6bed8f4 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -248,8 +248,8 @@
                                     name
                                     value)))
         (set-slot 'source nil)
-        (set-slot 'type 'standard)
-        (set-slot 'documentation "The standard method combination.")
+        (set-slot 'type-name 'standard)
+        (set-slot '%documentation "The standard method combination.")
         (set-slot 'options ()))
       (setq *standard-method-combination* smc))))
 
@@ -280,7 +280,7 @@
                 (!bootstrap-set-slot 'class-eq-specializer spec 'object
                                      class)
                 spec))
-    (set-slot 'class-precedence-list (classes cpl))
+    (set-slot '%class-precedence-list (classes cpl))
     (set-slot 'cpl-available-p t)
     (set-slot 'can-precede-list (classes (cdr cpl)))
     (set-slot 'incompatible-superclass-list nil)
@@ -288,9 +288,7 @@
     (set-slot 'direct-subclasses (classes direct-subclasses))
     (set-slot 'direct-methods (cons nil nil))
     (set-slot 'wrapper wrapper)
-    (set-slot 'predicate-name (or (cadr (assoc name *early-class-predicates*))
-                                  (make-class-predicate-name name)))
-    (set-slot 'documentation nil)
+    (set-slot '%documentation nil)
     (set-slot 'plist
               `(,@(and direct-default-initargs
                        `(direct-default-initargs ,direct-default-initargs))
@@ -320,9 +318,6 @@
     (case metaclass-name
       (structure-class
        (let ((constructor-sym '|STRUCTURE-OBJECT class constructor|))
-         (set-slot 'predicate-name (or (cadr (assoc name
-                                                    *early-class-predicates*))
-                                       (make-class-predicate-name name)))
          (set-slot 'defstruct-form
                    `(defstruct (structure-object (:constructor
                                                   ,constructor-sym)
@@ -363,9 +358,9 @@
       (set-val 'readers      (get-val :readers))
       (set-val 'writers      (get-val :writers))
       (set-val 'allocation   :instance)
-      (set-val 'type         (or (get-val :type) t))
-      (set-val 'documentation (or (get-val :documentation) ""))
-      (set-val 'class   class)
+      (set-val '%type        (or (get-val :type) t))
+      (set-val '%documentation (or (get-val :documentation) ""))
+      (set-val '%class   class)
       (when effective-p
         (set-val 'location index)
         (let ((fsc-p nil))
@@ -404,13 +399,7 @@
                  slot-name
                  readers
                  writers
-                 nil)
-                (!bootstrap-accessor-definitions1
-                 'slot-object
-                 slot-name
-                 (list (slot-reader-name slot-name))
-                 (list (slot-writer-name slot-name))
-                 (list (slot-boundp-name slot-name)))))))))))
+                 nil)))))))))
 
 (defun !bootstrap-accessor-definition (class-name accessor-name slot-name type)
   (multiple-value-bind (accessor-class make-method-function arglist specls doc)
@@ -471,13 +460,13 @@
     (dolist (writer writers) (do-writer-definition writer))
     (dolist (boundp boundps) (do-boundp-definition boundp))))
 
+;;; FIXME: find a better name.
 (defun !bootstrap-class-predicates (early-p)
   (let ((*early-p* early-p))
-    (dolist (definition *early-class-definitions*)
-      (let* ((name (ecd-class-name definition))
-             (class (find-class name)))
-        (setf (find-class-predicate name)
-              (make-class-predicate class (class-predicate-name class)))))))
+    (dolist (ecp *early-class-predicates*)
+      (let ((class-name (car ecp))
+            (predicate-name (cadr ecp)))
+        (make-class-predicate (find-class class-name) predicate-name)))))
 
 (defun !bootstrap-built-in-classes ()
 
@@ -516,13 +505,7 @@
                                        name class-eq-wrapper nil
                                        supers subs
                                        (cons name cpl)
-                                       wrapper prototype)))))
-
-  (dolist (e *built-in-classes*)
-    (let* ((name (car e))
-           (class (find-class name)))
-      (setf (find-class-predicate name)
-            (make-class-predicate class (class-predicate-name class))))))
+                                       wrapper prototype))))))
 
 (defmacro wrapper-of-macro (x)
   `(layout-of ,x))
@@ -588,14 +571,15 @@
           (t
            (error "~@<~S is not the name of a class.~@:>" name)))))
 
-(defun ensure-defstruct-class (classoid)
+(defun ensure-deffoo-class (classoid)
   (let ((class (classoid-pcl-class classoid)))
     (cond (class
            (ensure-non-standard-class (class-name class) class))
           ((eq 'complete *boot-state*)
            (ensure-non-standard-class (classoid-name classoid))))))
 
-(pushnew 'ensure-defstruct-class sb-kernel::*defstruct-hooks*)
+(pushnew 'ensure-deffoo-class sb-kernel::*defstruct-hooks*)
+(pushnew 'ensure-deffoo-class sb-kernel::*define-condition-hooks*)
 
 (defun make-class-predicate (class name)
   (let* ((gf (ensure-generic-function name :lambda-list '(object)))