0.8.12.27:

[sbcl.git] / src / pcl / slots-boot.lisp

diff --git a/src/pcl/slots-boot.lisp b/src/pcl/slots-boot.lisp
index dc46d56..354e3e5 100644 (file)
--- a/src/pcl/slots-boot.lisp
+++ b/src/pcl/slots-boot.lisp
@@ -78,8 +78,12 @@
                                              (slot-missing-fun slot-name type)
                                              "generated slot-missing method"
                                              slot-name)))))
-        (unless (fboundp fun-name)
-      (let ((gf (ensure-generic-function fun-name)))
+    (unless (fboundp fun-name)
+      (let ((gf (ensure-generic-function
+                fun-name
+                :lambda-list (ecase type
+                               ((reader boundp) '(object))
+                               (writer '(new-value object))))))
         (ecase type
           (reader (add-slot-missing-method gf slot-name 'slot-value))
           (boundp (add-slot-missing-method gf slot-name 'slot-boundp))
@@ -94,7 +98,8 @@
     `(let ((.ignore. (load-time-value
                      (ensure-accessor 'reader ',reader-name ',slot-name))))
       (declare (ignore .ignore.))
-      (funcall #',reader-name ,object))))
+      (truly-the (values t &optional)
+                 (funcall #',reader-name ,object)))))
 
 (defmacro accessor-set-slot-value (object slot-name new-value &environment env)
   (aver (constantp slot-name))
@@ -191,7 +196,14 @@
        (let ((value (cdr index)))
          (if (eq value +slot-unbound+)
              (values (slot-unbound (class-of instance) instance slot-name))
-             value)))))
+             value))))
+     (null
+      (lambda (instance)
+       ;; maybe MOP-ERROR?  You get here by making effective slot
+       ;; definitions with :ALLOCATION not :INSTANCE or :CLASS, and
+       ;; not defining any methods on SLOT-VALUE-USING-CLASS.
+       (error "~S called on ~S for the slot ~S (with no location information)"
+              'slot-value instance slot-name))))
    `(reader ,slot-name)))
 
 (defun make-optimized-std-writer-method-function (fsc-p slot-name index)
@@ -209,7 +221,13 @@
                         nv))))
      (cons   (lambda (nv instance)
               (check-obsolete-instance instance)
-              (setf (cdr index) nv))))
+              (setf (cdr index) nv)))
+     (null
+      (lambda (nv instance)
+       (declare (ignore nv))
+       ;; again, maybe MOP-ERROR (see above)
+       (error "~S called on ~S for the slot ~S (with no location information)"
+              '(setf slot-value) instance slot-name))))
    `(writer ,slot-name)))
 
 (defun make-optimized-std-boundp-method-function (fsc-p slot-name index)
@@ -229,7 +247,11 @@
                            +slot-unbound+)))))
      (cons (lambda (instance)
             (check-obsolete-instance instance)
-            (not (eq (cdr index) +slot-unbound+)))))
+            (not (eq (cdr index) +slot-unbound+))))
+     (null
+      (lambda (instance)
+       (error "~S called on ~S for the slot ~S (with no location information)"
+              'slot-boundp instance slot-name))))
    `(boundp ,slot-name)))
 
 (defun make-optimized-structure-slot-value-using-class-method-function (function)
@@ -323,7 +345,12 @@
              (let ((value (cdr index)))
                (if (eq value +slot-unbound+)
                    (values (slot-unbound class instance slot-name))
-                   value))))))
+                   value))))
+    (null
+     (lambda (class instance slotd)
+       ;; FIXME: MOP-ERROR
+       (error "Standard ~S method called on arguments ~S."
+             'slot-value-using-class (list class instance slotd))))))
 
 (defun make-optimized-std-setf-slot-value-using-class-method-function
     (fsc-p slot-name index)
@@ -344,7 +371,11 @@
     (cons  (lambda (nv class instance slotd)
             (declare (ignore class slotd))
             (check-obsolete-instance instance)
-            (setf (cdr index) nv)))))
+            (setf (cdr index) nv)))
+    (null (lambda (nv class instance slotd)
+           (error "Standard ~S method called on arguments ~S."
+                  '(setf slot-value-using-class)
+                  (list nv class instance slotd))))))
 
 (defun make-optimized-std-slot-boundp-using-class-method-function
     (fsc-p slot-name index)
@@ -365,7 +396,10 @@
     (cons   (lambda (class instance slotd)
              (declare (ignore class slotd))
              (check-obsolete-instance instance)
-             (not (eq (cdr index) +slot-unbound+))))))
+             (not (eq (cdr index) +slot-unbound+))))
+    (null (lambda (class instance slotd)
+           (error "Standard ~S method called on arguments ~S."
+                  'slot-boundp-using-class (list class instance slotd))))))
 
 (defun get-accessor-from-svuc-method-function (class slotd sdfun name)
   (macrolet ((emf-funcall (emf &rest args)
@@ -464,15 +498,16 @@
           initargs)))
 
 (defun initialize-internal-slot-gfs (slot-name &optional type)
-  (macrolet ((frob (type name-fun add-fun)
+  (macrolet ((frob (type name-fun add-fun ll)
               `(when (or (null type) (eq type ',type))
                 (let* ((name (,name-fun slot-name))
-                       (gf (ensure-generic-function name))
+                       (gf (ensure-generic-function name
+                                                    :lambda-list ',ll))
                        (methods (generic-function-methods gf)))
                   (when (or (null methods)
                             (plist-value gf 'slot-missing-method))
                     (setf (plist-value gf 'slot-missing-method) nil)
                     (,add-fun *the-class-slot-object* gf slot-name))))))
-    (frob reader slot-reader-name add-reader-method)
-    (frob writer slot-writer-name add-writer-method)
-    (frob boundp slot-boundp-name add-boundp-method)))
+    (frob reader slot-reader-name add-reader-method (object))
+    (frob writer slot-writer-name add-writer-method (new-value object))
+    (frob boundp slot-boundp-name add-boundp-method (object))))