X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..b0ff693c25bf81f935efa15a44fdad6ce95e9f91:/src/class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index 53812c9..3345ac3 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -44,6 +44,7 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
      (class :ichains :start) (class :ichains :end)
      (class :ilayout :start) (class :ilayout :slots) (class :ilayout :end)
      (class :conversions)
+     (class :message-macros)
      (class :object)
      (:classes :end))
 
@@ -104,15 +105,73 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
 		     (sod-class-nickname super-head))))
 	 (terpri stream)))))
 
+  ;; Provide convenience macros for sending the newly defined messages.  (The
+  ;; macros work on all subclasses too.)
+  ;;
+  ;; We need each message's method entry type for this, so we need to dig it
+  ;; out of the vtmsgs structure.  Indeed, the vtmsgs for this class contains
+  ;; entries for precisely the messages we want to make macros for.
+  (when (sod-class-messages class)
+    (sequence-output (stream sequencer)
+      ((class :message-macros)
+       (let* ((vtable (find (sod-class-chain-head class)
+			    (sod-class-vtables class)
+			    :key #'vtable-chain-head))
+	      (vtmsgs (find-if (lambda (item)
+				 (and (typep item 'vtmsgs)
+				      (eql (vtmsgs-class item) class)))
+			       (vtable-body vtable))))
+	 (format stream "/* Message invocation macros. */~%")
+	 ;;(break)
+	 (dolist (entry (vtmsgs-entries vtmsgs))
+	   (let* ((type (method-entry-function-type entry))
+		  (args (c-function-arguments type))
+		  (method (method-entry-effective-method entry))
+		  (message (effective-method-message method))
+		  (in-names nil) (out-names nil) (varargsp nil) (me "me"))
+	     (do ((args args (cdr args)))
+		 ((endp args))
+	       (let* ((raw-name (argument-name (car args)))
+		      (name (if (find raw-name
+				      (list "_vt"
+					    (sod-class-nickname class)
+					    (sod-message-name message))
+				      :test #'string=)
+				(format nil "sod__a_~A" raw-name)
+				raw-name)))
+		 (cond ((and (cdr args) (eq (cadr args) :ellipsis))
+			(setf varargsp t)
+			(unless in-names (setf me "SOD__CAR(__VA_ARGS__)"))
+			(push (format nil "/*~A*/ ..." name) in-names)
+			(push "__VA_ARGS__" out-names)
+			(return))
+		       (t
+			(push name in-names)
+			(push name out-names)))))
+	     (when varargsp
+	       (format stream "#if __STDC_VERSION__ >= 199901~%"))
+	     (format stream "#define ~A(~{~A~^, ~}) ~
+				   ~A->_vt->~A.~A(~{~A~^, ~})~%"
+		     (message-macro-name class message)
+		     (nreverse in-names)
+		     me
+		     (sod-class-nickname class)
+		     (sod-message-name message)
+		     (nreverse out-names))
+	     (when varargsp
+	       (format stream "#endif~%"))))
+	 (terpri stream)))))
+
   ;; Generate vtmsgs structure for all superclasses.
   (hook-output (car (sod-class-vtables class))
 		    'vtmsgs
 		    sequencer))
 
 (defmethod hook-output progn ((class sod-class) reason sequencer)
-  (with-slots (ilayout vtables methods) class
+  (with-slots (ilayout vtables methods effective-methods) class
     (hook-output ilayout reason sequencer)
     (dolist (method methods) (hook-output method reason sequencer))
+    (dolist (method effective-methods) (hook-output method reason sequencer))
     (dolist (vtable vtables) (hook-output vtable reason sequencer))))
 
 ;;;--------------------------------------------------------------------------
@@ -278,10 +337,6 @@ (defmethod hook-output progn ((vtmsgs vtmsgs) reason sequencer)
   (with-slots (entries) vtmsgs
     (dolist (entry entries) (hook-output entry reason sequencer))))
 
-(defmethod hook-output progn ((entry method-entry) reason sequencer)
-  (with-slots (method) entry
-    (hook-output method reason sequencer)))
-
 (defmethod hook-output progn ((entry method-entry)
 			      (reason (eql 'vtmsgs))
 			      sequencer)
@@ -439,7 +494,7 @@ (defmethod hook-output progn ((cptr class-pointer)
 		   (format nil "_cls_~A"
 			   (sod-class-nickname meta-chain-head))
 		   "_class")
-	       (sod-class-metaclass class)
+	       class
 	       (sod-class-nickname meta-chain-head)
 	       (sod-class-nickname metaclass))))))