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

diff --git a/src/class-output.lisp b/src/class-output.lisp
index a59bda0..ee77a2c 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -185,7 +185,7 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
 	     (when varargsp
 	       (format stream "#ifdef SOD__HAVE_VARARGS_MACROS~%"))
 	     (format stream "#define ~A(~{~A~^, ~}) ~
-				   ~A->_vt->~A.~A(~{~A~^, ~})~%"
+				   (~A)->_vt->~A.~A(~{~A~^, ~})~%"
 		     (message-macro-name class entry)
 		     (nreverse in-names)
 		     me
@@ -299,7 +299,7 @@ (defmethod hook-output progn
 			 (c-function-keywords type))))
 	 (when keys
 	   (format stream "struct ~A {~%~
-			   ~{  unsigned ~A : 1;~%~}~
+			   ~{  unsigned ~A: 1;~%~}~
 			   };~2%"
 		   (direct-method-suppliedp-struct-tag method)
 		   (mapcar #'argument-name keys))))))))
@@ -511,7 +511,7 @@ (defmethod hook-output progn
 				  class)
 	   (format stream "~&struct ~A {~%"
 		   (effective-method-keyword-struct-tag method))
-	   (format stream "~{  unsigned ~A__suppliedp : 1;~%~}"
+	   (format stream "~{  unsigned ~A__suppliedp: 1;~%~}"
 		   (mapcar #'argument-name keys))
 	   (dolist (key keys)
 	     (write-string "  " stream)
@@ -659,7 +659,7 @@ (defgeneric find-class-initializer (slot class)
     (let ((dslot (effective-slot-direct-slot slot)))
       (or (some (lambda (super)
 		  (find dslot (sod-class-class-initializers super)
-			:test #'sod-initializer-slot))
+			:key #'sod-initializer-slot))
 		(sod-class-precedence-list class))
 	  (effective-slot-initializer slot)))))