src/method-aggregate.lisp: Fix export for `aggregating-effective-method'.

[sod] / src / class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index 53812c9942e5e4dc91fc805415b3c2b933c71ca1..687b22c91af7e30b22ae60ea915e80e2f1dca164 100644 (file)
--- 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)
                    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))
     (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))))
 
 ;;;--------------------------------------------------------------------------
     (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))))
 
   (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)
 (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")
                   (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))))))
 
               (sod-class-nickname meta-chain-head)
               (sod-class-nickname metaclass))))))