X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/9ec578d9fe450b7e7f9030dc9d930185593aa991..bf8aadd76bceba05d2a325181a71763a5625c89b:/src/class-make-impl.lisp

diff --git a/src/class-make-impl.lisp b/src/class-make-impl.lisp
index 09ce441..32b2e61 100644
--- a/src/class-make-impl.lisp
+++ b/src/class-make-impl.lisp
@@ -79,7 +79,7 @@
 (defmethod make-sod-slot
     ((class sod-class) name type pset &optional location)
   (with-default-error-location (location)
-    (let ((slot (make-instance (get-property pset :lisp-class :symbol
+    (let ((slot (make-instance (get-property pset :slot-class :symbol
 					     'sod-slot)
 			       :class class
 			       :name name
@@ -129,7 +129,7 @@
 (defmethod make-sod-initializer-using-slot
     ((class sod-class) (slot sod-slot)
      init-class value-kind value-form pset location)
-  (make-instance (get-property pset :lisp-class :symbol init-class)
+  (make-instance (get-property pset :initializer-class :symbol init-class)
 		 :class class
 		 :slot slot
 		 :value-kind value-kind
@@ -152,13 +152,16 @@
 (defmethod make-sod-message
     ((class sod-class) name type pset &optional location)
   (with-default-error-location (location)
-    (let ((message (make-instance (get-property pset :lisp-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)))))))
 
@@ -189,7 +192,7 @@
 
 (defmethod make-sod-method-using-message
     ((message sod-message) (class sod-class) type body pset location)
-  (make-instance (or (get-property pset :lisp-class :symbol)
+  (make-instance (or (get-property pset :method-class :symbol)
 		     (sod-message-method-class message class pset))
 		 :message message
 		 :class class
@@ -211,7 +214,8 @@
   (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")))