1.0.0.28: more PCL cleanups

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

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index e18daee..7b00490 100644 (file)
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -52,28 +52,38 @@
                              :initial-element +slot-unbound+))))
     instance))
 
-(defmacro allocate-funcallable-instance-slots (wrapper &optional
-                                                       slots-init-p slots-init)
+(defmacro allocate-standard-funcallable-instance-slots
+    (wrapper &optional slots-init-p slots-init)
   `(let ((no-of-slots (wrapper-no-of-instance-slots ,wrapper)))
-     ,(if slots-init-p
-          `(if ,slots-init-p
-               (make-array no-of-slots :initial-contents ,slots-init)
-               (make-array no-of-slots :initial-element +slot-unbound+))
-          `(make-array no-of-slots :initial-element +slot-unbound+))))
-
-(defun allocate-funcallable-instance (wrapper &optional
-                                              (slots-init nil slots-init-p))
-  (let ((fin (%make-pcl-funcallable-instance nil nil
-                                             (get-instance-hash-code))))
+    ,(if slots-init-p
+         `(if ,slots-init-p
+           (make-array no-of-slots :initial-contents ,slots-init)
+           (make-array no-of-slots :initial-element +slot-unbound+))
+         `(make-array no-of-slots :initial-element +slot-unbound+))))
+
+(define-condition unset-funcallable-instance-function
+    (reference-condition simple-error)
+  ()
+  (:default-initargs
+   :references (list '(:amop :generic-function allocate-instance)
+                     '(:amop :function set-funcallable-instance-function))))
+
+(defun allocate-standard-funcallable-instance
+    (wrapper &optional (slots-init nil slots-init-p))
+  (let ((fin (%make-standard-funcallable-instance
+              nil nil (get-instance-hash-code))))
     (set-funcallable-instance-function
      fin
      #'(lambda (&rest args)
          (declare (ignore args))
-         (error "The function of the funcallable-instance ~S has not been set."
-                fin)))
+         (error 'unset-funcallable-instance-function
+                :format-control "~@<The function of funcallable instance ~
+                                 ~S has not been set.~@:>"
+                :format-arguments (list fin))))
     (setf (fsc-instance-wrapper fin) wrapper
-          (fsc-instance-slots fin) (allocate-funcallable-instance-slots
-                                    wrapper slots-init-p slots-init))
+          (fsc-instance-slots fin)
+          (allocate-standard-funcallable-instance-slots
+           wrapper slots-init-p slots-init))
     fin))
 
 (defun allocate-structure-instance (wrapper &optional
@@ -197,7 +207,7 @@
                       ()))
 
               (setq proto (if (eq meta 'funcallable-standard-class)
-                              (allocate-funcallable-instance wrapper)
+                              (allocate-standard-funcallable-instance wrapper)
                               (allocate-standard-instance wrapper)))
 
               (setq direct-slots
@@ -266,6 +276,7 @@
     (set-slot 'name name)
     (set-slot 'finalized-p t)
     (set-slot 'source source)
+    (set-slot 'safe-p nil)
     (set-slot '%type (if (eq class (find-class t))
                          t
                          ;; FIXME: Could this just be CLASS instead
@@ -359,6 +370,7 @@
       (set-val 'writers      (get-val :writers))
       (set-val 'allocation   :instance)
       (set-val '%type        (or (get-val :type) t))
+      (set-val '%type-check-function (get-val 'type-check-function))
       (set-val '%documentation (or (get-val :documentation) ""))
       (set-val '%class   class)
       (when effective-p
@@ -415,8 +427,7 @@
                         (list class-name)
                         (list class-name)
                         "automatically generated boundp method")))
-    (let ((gf (ensure-generic-function accessor-name
-                                       :lambda-list arglist)))
+    (let ((gf (ensure-generic-function accessor-name :lambda-list arglist)))
       (if (find specls (early-gf-methods gf)
                 :key #'early-method-specializers
                 :test 'equal)
@@ -430,7 +441,9 @@
                                      (funcall make-method-function
                                               class-name slot-name)
                                      doc
-                                     slot-name))))))
+                                     :slot-name slot-name
+                                     :object-class class-name
+                                     :method-class-function (constantly (find-class accessor-class))))))))
 
 (defun !bootstrap-accessor-definitions1 (class-name
                                         slot-name
@@ -503,16 +516,12 @@
                                        (cons name cpl)
                                        wrapper prototype))))))
 \f
-(defmacro wrapper-of-macro (x)
-  `(layout-of ,x))
-
-(defun class-of (x)
-  (wrapper-class* (wrapper-of-macro x)))
-
-;;; FIXME: We probably don't need both WRAPPER-OF and WRAPPER-OF-MACRO.
 #-sb-fluid (declaim (inline wrapper-of))
 (defun wrapper-of (x)
-  (wrapper-of-macro x))
+  (layout-of x))
+
+(defun class-of (x)
+  (wrapper-class* (wrapper-of x)))
 
 (defun eval-form (form)
   (lambda () (eval form)))
@@ -577,6 +586,7 @@
 (pushnew 'ensure-deffoo-class sb-kernel::*defstruct-hooks*)
 (pushnew 'ensure-deffoo-class sb-kernel::*define-condition-hooks*)
 \f
+;;; FIXME: only needed during bootstrap
 (defun make-class-predicate (class name)
   (let* ((gf (ensure-generic-function name :lambda-list '(object)))
          (mlist (if (eq *boot-state* 'complete)
@@ -585,8 +595,8 @@
     (unless mlist
       (unless (eq class *the-class-t*)
         (let* ((default-method-function #'constantly-nil)
-               (default-method-initargs (list :function
-                                              default-method-function))
+               (default-method-initargs (list :function default-method-function
+                                              'plist '(:constant-value nil)))
                (default-method (make-a-method
                                 'standard-method
                                 ()
@@ -594,19 +604,16 @@
                                 (list *the-class-t*)
                                 default-method-initargs
                                 "class predicate default method")))
-          (setf (method-function-get default-method-function :constant-value)
-                nil)
           (add-method gf default-method)))
       (let* ((class-method-function #'constantly-t)
-             (class-method-initargs (list :function
-                                          class-method-function))
+             (class-method-initargs (list :function class-method-function
+                                          'plist '(:constant-value t)))
              (class-method (make-a-method 'standard-method
                                           ()
                                           (list 'object)
                                           (list class)
                                           class-method-initargs
                                           "class predicate class method")))
-        (setf (method-function-get class-method-function :constant-value) t)
         (add-method gf class-method)))
     gf))