X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/fd040f066b906ce63396b9703bc16d32bcc5204e..ed3ce6c2352d76442b79badfbe08bc6ecde6934d:/src/class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index 806de35..dec1e4e 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -94,10 +94,17 @@
 	   (metaroot (find-root-metaclass class)))
        (format stream "/* The class object. */~@
 		       extern const struct ~A ~A__classobj;~@
-		       #define ~:*~A__class (&~:*~A__classobj.~A.~A)~2%"
+		       #define ~:*~A__class (&~:*~A__classobj.~A.~A)~%"
 	       (ilayout-struct-tag metaclass) class
 	       (sod-class-nickname (sod-class-chain-head metaroot))
-	       (sod-class-nickname metaroot)))))
+	       (sod-class-nickname metaroot))
+       (dolist (chain (sod-class-chains metaclass))
+	 (let ((tail (car chain)))
+	   (unless (eq tail metaroot)
+	     (format stream "#define ~A__cls_~A (&~2:*~A__classobj.~A.~A)~%"
+		     class (sod-class-nickname (sod-class-chain-head tail))
+		     (sod-class-nickname tail)))))
+       (terpri stream))))
 
   ;; Maybe generate an islots structure.
   (when (sod-class-slots class)
@@ -185,7 +192,7 @@
 	     (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
@@ -654,15 +661,6 @@ const struct ~A ~A__classobj = {~%"
 	       (vtable-name class chain-head)
 	       (sod-class-nickname chain-tail))))))
 
-(defgeneric find-class-initializer (slot class)
-  (:method ((slot effective-slot) (class sod-class))
-    (let ((dslot (effective-slot-direct-slot slot)))
-      (or (some (lambda (super)
-		  (find dslot (sod-class-class-initializers super)
-			:key #'sod-initializer-slot))
-		(sod-class-precedence-list class))
-	  (effective-slot-initializer slot)))))
-
 (defgeneric output-class-initializer (slot instance stream)
   (:method ((slot sod-class-effective-slot) (instance sod-class) stream)
     (let ((func (effective-slot-initializer-function slot))