X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fvector.lisp;h=c4d7eba9d64884e2f28fde2afe97cddf38741955;hb=316eddc9b2b1aa24012ed826ce700105fdbcdfdb;hp=a33b8917d791bbdb77f7cac207f1499327d0f7bf;hpb=a8f0175b16a00f5fc83eb8d8a718ae7fc5497514;p=sbcl.git

diff --git a/src/pcl/vector.lisp b/src/pcl/vector.lisp
index a33b891..c4d7eba 100644
--- a/src/pcl/vector.lisp
+++ b/src/pcl/vector.lisp
@@ -529,7 +529,7 @@
 	       (position (posq parameter-entry slots))
 	       (pv-offset-form (list 'pv-offset ''.PV-OFFSET.)))
 	  (unless parameter-entry
-	    (error "internal error in slot optimization"))
+	    (bug "slot optimization bewilderment: O-I-A"))
 	  (unless slot-entry
 	    (setq slot-entry (list slot-name))
 	    (push slot-entry (cdr parameter-entry)))
@@ -557,7 +557,7 @@
 	 (position (posq parameter-entry slots))
 	 (pv-offset-form (list 'pv-offset ''.PV-OFFSET.)))
     (unless parameter-entry
-      (error "internal error in slot optimization"))
+      (error "slot optimization bewilderment: O-A-C"))
     (unless slot-entry
       (setq slot-entry (list name))
       (push slot-entry (cdr parameter-entry)))
@@ -638,7 +638,7 @@
 	 (standard-class-p class)
 	 (not (eq class *the-class-t*)) ; shouldn't happen, though.
 	 (let ((slotd (find-slot-definition class slot-name)))
-	   (and slotd (classp (slot-definition-allocation slotd)))))))
+	   (and slotd (eq :class (slot-definition-allocation slotd)))))))
 
 (defun skip-fast-slot-access-p (class-form slot-name-form type)
   (let ((class (and (constantp class-form) (eval class-form)))
@@ -1008,8 +1008,8 @@
 ;;; Pull a name out of the %METHOD-NAME declaration in the function
 ;;; body given, or return NIL if no %METHOD-NAME declaration is found.
 (defun body-method-name (body)
-  (multiple-value-bind (documentation declarations real-body)
-      (extract-declarations body nil)
+  (multiple-value-bind (real-body declarations documentation)
+      (parse-body body nil)
     (declare (ignore documentation real-body))
     (let ((name-decl (get-declaration '%method-name declarations)))
       (and name-decl
@@ -1156,7 +1156,7 @@
 	 (w-t pv-wrappers))
     (dolist (arg args)
       (setq w (wrapper-of arg))
-      (unless (eq t (wrapper-state w)) ; FIXME: should be INVALID-WRAPPER-P
+      (when (invalid-wrapper-p w)
 	(setq w (check-wrapper-validity arg)))
       (setf (car w-t) w))
       (setq w-t (cdr w-t))