X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/5135d00a5e5184b2ba955a1f9e538ad603848466..675b48242d0f5c6f2f2563003a1d2fd87e06522c:/src/method-proto.lisp?ds=sidebyside

diff --git a/src/method-proto.lisp b/src/method-proto.lisp
index b821912..2d5f471 100644
--- a/src/method-proto.lisp
+++ b/src/method-proto.lisp
@@ -63,6 +63,15 @@
 
    This protocol is used by `simple-message' subclasses."))
 
+(export 'method-keyword-argument-lists)
+(defgeneric method-keyword-argument-lists (method direct-methods)
+  (:documentation
+   "Returns a list of keyword argument lists to be merged.
+
+   This should return a list suitable for passing to `merge-keyword-lists',
+   i.e., each element should be a pair consisting of a list of `argument'
+   objects and a string describing the source of the argument list."))
+
 (export 'compute-sod-effective-method)
 (defgeneric compute-sod-effective-method (message class)
   (:documentation
@@ -138,6 +147,16 @@
 
    No `me' argument is prepended; any `:ellipsis' is left as it is."))
 
+(export 'sod-method-description)
+(defgeneric sod-method-description (method)
+  (:documentation
+   "Return an adjectival phrase describing METHOD.
+
+    The result will be placed into an error message reading something like
+    ``Conflicting definition of DESCRIPTION direct method `bogus'''.  Two
+    direct methods which can coexist in the same class, defined on the same
+    message, should have differing descriptions."))
+
 (export 'sod-method-function-type)
 (defgeneric sod-method-function-type (method)
   (:documentation
@@ -281,14 +300,10 @@
 
 ;;; Utilities.
 
-(defvar *keyword-struct-disposition* :unset
+(defvar-unbound *keyword-struct-disposition*
   "The current state of the keyword structure.
 
-   This can be one of four values.
-
-     * `:unset' -- the top-level default, mostly because I can't leave it
-       unbound and write this documentation.  Nothing that matters should see
-       this state.
+   This can be one of three values.
 
      * `:local' -- the structure itself is in a local variable `sod__kw'.
        This is used in the top-level effective method.
@@ -419,14 +434,17 @@
 			   (cons (make-argument *sod-key-pointer*
 						(c-type (* (void :const))))
 				 raw-args))))
-	 (*keyword-struct-disposition* t))
+	 (*keyword-struct-disposition* (if (effective-method-keywords method)
+					   :pointer :null)))
     (codegen-push codegen)
     (ensure-ilayout-var codegen super)
-    (when (and (keyword-message-p message)
-	       (not (eq *keyword-struct-disposition* :null)))
-      (let ((tag (effective-method-keyword-struct-tag method)))
-	(ensure-var codegen *sod-keywords* (c-type (* (struct tag :const)))
-		    *sod-key-pointer*)))
+    (when (keyword-message-p message)
+      (if (eq *keyword-struct-disposition* :null)
+	  (deliver-call codegen :void "SOD__IGNORE" *sod-key-pointer*)
+	  (let ((tag (effective-method-keyword-struct-tag method)))
+	    (ensure-var codegen *sod-keywords*
+			(c-type (* (struct tag :const)))
+			*sod-key-pointer*))))
     (funcall body (codegen-target codegen))
     (codegen-pop-function codegen (temporary-function)
 			  (c-type (fun (lisp return-type)
@@ -490,11 +508,9 @@
    nil."
 
   (let* ((message (codegen-message codegen))
-	 (argument-tail (cond ((varargs-message-p message)
-			       (cons *sod-tmp-ap* basic-tail))
-			      ((keyword-message-p message)
-			       (cons (keyword-struct-pointer) basic-tail))
-			      (t basic-tail))))
+	 (argument-tail (if (varargs-message-p message)
+			    (cons *sod-tmp-ap* basic-tail)
+			    basic-tail)))
     (labels ((next-trampoline (method chain)
 	       (if (or kernel chain)
 		   (make-trampoline codegen (sod-method-class method)
@@ -505,9 +521,13 @@
 	       (if (null chain)
 		   (funcall kernel target)
 		   (let ((trampoline (next-trampoline (car chain)
-						      (cdr chain))))
+						      (cdr chain)))
+			 (tail (if (keyword-message-p message)
+				   (cons (keyword-struct-pointer)
+					 argument-tail)
+				   argument-tail)))
 		     (invoke-method codegen target
-				    (cons trampoline argument-tail)
+				    (cons trampoline tail)
 				    (car chain))))))
       (invoke chain target))))