src/{c-types-impl,method-{proto,impl}}.lisp: Improve `merge-keyword-lists'.

[sod] / src / builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index 77eca391e49ea79bbf09e7e14c684274273ac411..be9a8e5caca366ee583f5126fa7c6e3dffced6c0 100644 (file)
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -295,15 +295,28 @@ (defmethod sod-message-effective-method-class
   'initialization-effective-method)
 
 (defmethod method-keyword-argument-lists
-    ((method initialization-effective-method) direct-methods)
+    ((method initialization-effective-method) direct-methods state)
   (append (call-next-method)
          (mapcan (lambda (class)
-                   (let ((initargs (sod-class-initargs class)))
+                   (let* ((initargs (sod-class-initargs class))
+                          (map (make-hash-table))
+                          (arglist (mapcar
+                                    (lambda (initarg)
+                                      (let ((arg (sod-initarg-argument
+                                                  initarg)))
+                                        (setf (gethash arg map) initarg)
+                                        arg))
+                                    initargs)))
                      (and initargs
-                          (list (cons (format nil "initargs for ~A"
-                                              class)
-                                      (mapcar #'sod-initarg-argument
-                                              initargs))))))
+                          (list (cons (lambda (arg)
+                                        (info-with-location
+                                         (gethash arg map)
+                                         "Type `~A' from initarg ~
+                                          in class `~A' (here)"
+                                         (argument-type arg) class)
+                                        (report-inheritance-path
+                                         state class))
+                                      arglist)))))
                  (sod-class-precedence-list
                   (effective-method-class method)))))