X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=37afe01e7a5098517532b96e38c0d65a6da87b49;hb=872175cd9cb5b4966a36d4bd92421cc407a0355b;hp=9249bdeee82de2fcc18a70df2ce337eb0e43cddd;hpb=39ca94ec421224c78cb01f7d2d7b49321c66a2d4;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 9249bde..37afe01 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1537,7 +1537,7 @@ bootstrapping.
 	      method
 	      gf
 	      (apply #'format nil string args)))
-	   (compare (x y)
+	   (comparison-description (x y)
 	     (if (> x y) "more" "fewer")))
       (let ((gf-nreq (arg-info-number-required arg-info))
 	    (gf-nopt (arg-info-number-optional arg-info))
@@ -1546,11 +1546,11 @@ bootstrapping.
 	(unless (= nreq gf-nreq)
 	  (lose
 	   "the method has ~A required arguments than the generic function."
-	   (compare nreq gf-nreq)))
+	   (comparison-description nreq gf-nreq)))
 	(unless (= nopt gf-nopt)
 	  (lose
-	   "the method has ~S optional arguments than the generic function."
-	   (compare nopt gf-nopt)))
+	   "the method has ~A optional arguments than the generic function."
+	   (comparison-description nopt gf-nopt)))
 	(unless (eq (or keysp restp) gf-key/rest-p)
 	  (error
 	   "The method and generic function differ in whether they accept~%~
@@ -1760,7 +1760,11 @@ bootstrapping.
 	 (setf (getf ,all-keys :method-combination)
 	       (find-method-combination (class-prototype ,gf-class)
 					(car combin)
-					(cdr combin)))))))
+					(cdr combin)))))
+    (let ((method-class (getf ,all-keys :method-class '.shes-not-there.)))
+      (unless (eq method-class '.shes-not-there.)
+        (setf (getf ,all-keys :method-class)
+                (find-class method-class t ,env))))))
 
 (defun real-ensure-gf-using-class--generic-function
        (existing