X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/52a79ab8b310a785f2c2f1a11069f3a5ad53810c..8293b90a8f027ed9b7e4ebb566f67e5c783864c9:/src/class-make-impl.lisp

diff --git a/src/class-make-impl.lisp b/src/class-make-impl.lisp
index 1daab39..32b2e61 100644
--- a/src/class-make-impl.lisp
+++ b/src/class-make-impl.lisp
@@ -152,13 +152,16 @@ (defmethod shared-initialize :after
 (defmethod make-sod-message
     ((class sod-class) name type pset &optional location)
   (with-default-error-location (location)
-    (let ((message (make-instance (get-property pset :message-class :symbol
-						'standard-message)
-				  :class class
-				  :name name
-				  :type type
-				  :location (file-location location)
-				  :pset pset)))
+    (let* ((msg-class (or (get-property pset :message-class :symbol)
+			  (and (get-property pset :combination :keyword)
+			       'aggregating-message)
+			  'standard-message))
+	   (message (make-instance msg-class
+				   :class class
+				   :name name
+				   :type type
+				   :location (file-location location)
+				   :pset pset)))
       (with-slots (messages) class
 	(setf messages (append messages (list message)))))))
 
@@ -211,7 +214,8 @@ (defmethod shared-initialize :after
   (with-slots (body type) method
     (unless (or (not body)
 		(every (lambda (arg)
-			 (or (argument-name arg)
+			 (or (eq arg :ellipsis)
+			     (argument-name arg)
 			     (eq (argument-type arg) (c-type void))))
 		       (c-function-arguments type)))
       (error "Abstract declarators not permitted in method definitions")))