X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/048d0b2d143b6a491ac73eed6ab972e97774391c..4b8e5c0347115ff30841f1d1e71afe59ecb6c82c:/src/class-make-impl.lisp

diff --git a/src/class-make-impl.lisp b/src/class-make-impl.lisp
index ae65392..878f813 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
@@ -87,7 +87,8 @@
 			       :location (file-location location)
 			       :pset pset)))
       (with-slots (slots) class
-	(setf slots (append slots (list slot)))))))
+	(setf slots (append slots (list slot))))
+      slot)))
 
 (defmethod shared-initialize :after ((slot sod-slot) slot-names &key pset)
   "This method does nothing.
@@ -111,7 +112,8 @@
 			 (file-location location))))
       (with-slots (instance-initializers) class
 	(setf instance-initializers
-	      (append instance-initializers (list initializer)))))))
+	      (append instance-initializers (list initializer))))
+      initializer)))
 
 (defmethod make-sod-class-initializer
     ((class sod-class) nick name value-kind value-form pset
@@ -124,12 +126,13 @@
 			 (file-location location))))
       (with-slots (class-initializers) class
 	(setf class-initializers
-	      (append class-initializers (list initializer)))))))
+	      (append class-initializers (list initializer))))
+      initializer)))
 
 (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,20 +155,24 @@
 (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)))))))
+	(setf messages (append messages (list message))))
+      message)))
 
 (defmethod shared-initialize :after
     ((message sod-message) slot-names &key pset)
   (declare (ignore slot-names pset))
-  (with-slots (type) message
+  (with-slots ((type %type)) message
     (check-message-type message type)))
 
 (defmethod check-message-type ((message sod-message) (type c-function-type))
@@ -185,11 +192,12 @@
 						  type body pset
 						  (file-location location))))
       (with-slots (methods) class
-	(setf methods (append methods (list method)))))))
+	(setf methods (append methods (list method))))
+      method)))
 
 (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
@@ -208,13 +216,17 @@
   (declare (ignore slot-names pset))
 
   ;; Check that the arguments are named if we have a method body.
-  (with-slots (body type) method
+  (with-slots (body (type %type)) method
     (unless (or (not body)
-		(every #'argument-name (c-function-arguments type)))
+		(every (lambda (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")))
 
   ;; Check the method type.
-  (with-slots (message type) method
+  (with-slots (message (type %type)) method
     (check-method-type method message type)))
 
 (defmethod check-method-type
@@ -223,7 +235,7 @@
 
 (defmethod check-method-type
     ((method sod-method) (message sod-message) (type c-function-type))
-  (with-slots ((msgtype type)) message
+  (with-slots ((msgtype %type)) message
     (unless (c-type-equal-p (c-type-subtype msgtype)
 			    (c-type-subtype type))
       (error "Method return type ~A doesn't match message ~A"