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

diff --git a/src/class-output.lisp b/src/class-output.lisp
index 53812c9..687b22c 100644
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -110,9 +110,10 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :h)) sequencer)
 		    sequencer))
 
 (defmethod hook-output progn ((class sod-class) reason sequencer)
-  (with-slots (ilayout vtables methods) class
+  (with-slots (ilayout vtables methods effective-methods) class
     (hook-output ilayout reason sequencer)
     (dolist (method methods) (hook-output method reason sequencer))
+    (dolist (method effective-methods) (hook-output method reason sequencer))
     (dolist (vtable vtables) (hook-output vtable reason sequencer))))
 
 ;;;--------------------------------------------------------------------------
@@ -278,10 +279,6 @@ (defmethod hook-output progn ((vtmsgs vtmsgs) reason sequencer)
   (with-slots (entries) vtmsgs
     (dolist (entry entries) (hook-output entry reason sequencer))))
 
-(defmethod hook-output progn ((entry method-entry) reason sequencer)
-  (with-slots (method) entry
-    (hook-output method reason sequencer)))
-
 (defmethod hook-output progn ((entry method-entry)
 			      (reason (eql 'vtmsgs))
 			      sequencer)
@@ -439,7 +436,7 @@ (defmethod hook-output progn ((cptr class-pointer)
 		   (format nil "_cls_~A"
 			   (sod-class-nickname meta-chain-head))
 		   "_class")
-	       (sod-class-metaclass class)
+	       class
 	       (sod-class-nickname meta-chain-head)
 	       (sod-class-nickname metaclass))))))