From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 30 Aug 2015 09:58:38 +0000 (+0100)
Subject: src/c-types-impl.lisp: Fix arg list in `c-function-type' instance init.
X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/8e36de0e30786727d872f21bf10eb7a579f15dd6

src/c-types-impl.lisp: Fix arg list in `c-function-type' instance init.

Previously, `make-function-type' was responsible for spotting `(void)'
argument lists and converting them into empty lists, so if you used
`make-instance' directly you could sneak an actual `(void)' argument
list int.  Now the instance initialization machinery for the
`c-function-type' class does this itself, so the gap is closed.
---

diff --git a/src/c-types-impl.lisp b/src/c-types-impl.lisp
index 4a0f6e2..ed65110 100644
--- a/src/c-types-impl.lisp
+++ b/src/c-types-impl.lisp
@@ -418,24 +418,30 @@
 (export '(c-function-type c-function-arguments))
 (defclass c-function-type (c-type)
   ((subtype :initarg :subtype :type c-type :reader c-type-subtype)
-   (arguments :initarg :arguments :type list :reader c-function-arguments))
+   (arguments :type list :reader c-function-arguments))
   (:documentation
    "C function types.  The subtype is the return type, as implied by the C
     syntax for function declarations."))
 
+(defmethod shared-initialize :after
+    ((type c-function-type) slot-names &key (arguments nil argsp))
+  (declare (ignore slot-names))
+  (when argsp
+    (setf (slot-value type 'arguments)
+	  (if (and arguments
+		   (null (cdr arguments))
+		   (not (eq (car arguments) :ellipsis))
+		   (eq (argument-type (car arguments)) c-type-void))
+	      nil
+	      arguments))))
+
 ;; Constructor function.
 
 (export 'make-function-type)
 (defun make-function-type (subtype arguments)
   "Return a new function type, returning SUBTYPE and accepting ARGUMENTS."
   (make-instance 'c-function-type :subtype subtype
-		 :arguments (if (and arguments
-				     (null (cdr arguments))
-				     (not (eq (car arguments) :ellipsis))
-				     (eq (argument-type (car arguments))
-					 c-type-void))
-				nil
-				arguments)))
+		 :arguments arguments))
 
 ;; Comparison protocol.