X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/1622ed8e30b05ba9025520cde3e68d186c8c7e50..ceed01afc84505ed0d116ee7a00e8b4a1a4bed6c:/src/method-impl.lisp

diff --git a/src/method-impl.lisp b/src/method-impl.lisp
index 1256376..5ea09e3 100644
--- a/src/method-impl.lisp
+++ b/src/method-impl.lisp
@@ -152,6 +152,11 @@ (define-on-demand-slot basic-direct-method function-type (method)
 		 ("me" (* (class (sod-method-class method))))
 		 . method-args))))
 
+(defmethod sod-method-description ((method basic-direct-method))
+  (with-slots (role) method
+    (if role (string-downcase role)
+	"primary")))
+
 (defmethod sod-method-function-name ((method basic-direct-method))
   (with-slots ((class %class) role message) method
     (format nil "~A__~@[~(~A~)_~]method_~A__~A" class role
@@ -244,21 +249,48 @@ (define-on-demand-slot delegating-direct-method function-type (method)
 ;;;--------------------------------------------------------------------------
 ;;; Effective method classes.
 
+(defmethod method-keyword-argument-lists
+    ((method effective-method) direct-methods state)
+  (with-slots (message) method
+    (and (keyword-message-p message)
+	 (cons (cons (lambda (arg)
+		       (let ((class (sod-message-class message)))
+			 (info-with-location
+			  message "Type `~A' declared in message ~
+				   definition in `~A' (here)"
+			  (argument-type arg) class)
+			 (report-inheritance-path state class)))
+		     (c-function-keywords (sod-message-type message)))
+	       (mapcar (lambda (m)
+			 (cons (lambda (arg)
+				 (let ((class (sod-method-class m)))
+				   (info-with-location
+				    m "Type `~A' declared in ~A direct ~
+				       method of `~A' (defined here)"
+				    (argument-type arg)
+				    (sod-method-description m) class)
+				   (report-inheritance-path state class)))
+			       (c-function-keywords (sod-method-type m))))
+		       direct-methods)))))
+
 (defmethod shared-initialize :after
     ((method effective-method) slot-names &key direct-methods)
   (declare (ignore slot-names))
 
-  ;; Set the keyword argument list.
-  (with-slots (message keywords) method
-    (setf keywords (and (keyword-message-p message)
-			(merge-keyword-lists
-			 (mapcar (lambda (m)
-				   (let ((type (sod-method-type m)))
-				     (cons (c-function-keywords type)
-					   (format nil "method for ~A on ~A"
-						   message
-						   (sod-method-class m)))))
-				 direct-methods))))))
+  ;; Set the keyword argument list.  Blame the class as a whole for mismatch
+  ;; errors, because they're fundamentally a non-local problem about the
+  ;; class construction.
+  (with-slots ((class %class) message keywords) method
+    (setf keywords
+	  (merge-keyword-lists
+	   (lambda ()
+	     (values class
+		     (format nil
+			     "methods for message `~A' ~
+			      applicable to class `~A'"
+			     message class)))
+	   (method-keyword-argument-lists method direct-methods
+	    (make-inheritance-path-reporter-state class))))))
 
 (export '(basic-effective-method
 	  effective-method-around-methods effective-method-before-methods
@@ -790,9 +822,11 @@ (defmethod compute-effective-method-body :around
 				       *null-pointer* 0)))
 	       (call-next-method)))))))
 
-(defmethod compute-method-entry-functions
-    ((method simple-effective-method))
-  (if (effective-method-primary-methods method)
+(defmethod effective-method-live-p ((method simple-effective-method))
+  (effective-method-primary-methods method))
+
+(defmethod compute-method-entry-functions :around ((method effective-method))
+  (if (effective-method-live-p method)
       (call-next-method)
       nil))