X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fbraid.lisp;h=9e65da9e73fd24a075b72c047a03c73c03990e53;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=ca1b434bf5904673407c30cf7fc91905f4ea4a67;hpb=3a10f894e7867fa2c27a3af05380abc3247f728d;p=sbcl.git

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index ca1b434..9e65da9 100644
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -194,7 +194,8 @@
 		   class)
 	      (dolist (slot slots)
 		(unless (eq (getf slot :allocation :instance) :instance)
-		  (error "Slot allocation ~S is not supported in bootstrap.")))
+		  (error "Slot allocation ~S is not supported in bootstrap."
+			 (getf slot :allocation))))
 
 	      (when (typep wrapper 'wrapper)
 		(setf (wrapper-instance-slots-layout wrapper)
@@ -295,6 +296,7 @@
     (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 'plist
 	      `(,@(and direct-default-initargs
 		       `(direct-default-initargs ,direct-default-initargs))
@@ -304,8 +306,7 @@
 				 structure-class condition-class
 				 slot-class std-class))
       (set-slot 'direct-slots direct-slots)
-      (set-slot 'slots slots)
-      (set-slot 'initialize-info nil))
+      (set-slot 'slots slots))
 
     ;; For all direct superclasses SUPER of CLASS, make sure CLASS is
     ;; a direct subclass of SUPER.  Note that METACLASS-NAME doesn't
@@ -435,7 +436,8 @@
 			(list class-name)
 			(list class-name)
 			"automatically generated boundp method")))
-    (let ((gf (ensure-generic-function accessor-name)))
+    (let ((gf (ensure-generic-function accessor-name
+				       :lambda-list arglist)))
       (if (find specls (early-gf-methods gf)
 		:key #'early-method-specializers
 		:test 'equal)
@@ -600,7 +602,7 @@
 (pushnew 'maybe-reinitialize-structure-class sb-kernel::*defstruct-hooks*)
 
 (defun make-class-predicate (class name)
-  (let* ((gf (ensure-generic-function name))
+  (let* ((gf (ensure-generic-function name :lambda-list '(object)))
 	 (mlist (if (eq *boot-state* 'complete)
 		    (generic-function-methods gf)
 		    (early-gf-methods gf))))
@@ -698,7 +700,7 @@
 (setq *boot-state* 'braid)
 
 (defmethod no-applicable-method (generic-function &rest args)
-  (error "~@<There is no matching method for the generic function ~2I~_~S~
+  (error "~@<There is no applicable method for the generic function ~2I~_~S~
 	  ~I~_when called with arguments ~2I~_~S.~:>"
 	 generic-function
 	 args))
@@ -720,3 +722,20 @@
 	  ~I~_when called with arguments ~2I~_~S.~:>"
 	 generic-function
 	 args))
+
+(defmethod invalid-qualifiers ((gf generic-function)
+			       combin
+			       method)
+  (let ((qualifiers (method-qualifiers method)))
+    (let ((why (cond
+		 ((cdr qualifiers) "has too many qualifiers")
+		 (t (aver (not (member (car qualifiers)
+				       '(:around :before :after))))
+		    "has an invalid qualifier"))))
+      (invalid-method-error
+       method
+       "The method ~S on ~S ~A.~%~
+        Standard method combination requires all methods to have one~%~
+        of the single qualifiers :AROUND, :BEFORE and :AFTER or to~%~
+        have no qualifier at all."
+       method gf why))))