src/class-output.lisp: Insert the correct class pointers.

[sod] / src / class-output.lisp

diff --git a/src/class-output.lisp b/src/class-output.lisp
index b168d8928987308d498bbf17de90de822a5e1e54..687b22c91af7e30b22ae60ea915e80e2f1dca164 100644 (file)
--- a/src/class-output.lisp
+++ b/src/class-output.lisp
@@ -113,8 +113,7 @@ (defmethod hook-output progn ((class sod-class) reason sequencer)
   (with-slots (ilayout vtables methods effective-methods) class
     (hook-output ilayout reason sequencer)
     (dolist (method methods) (hook-output method reason sequencer))
   (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 (method effective-methods) (hook-output method reason sequencer))

     (dolist (vtable vtables) (hook-output vtable reason sequencer))))
 
 ;;;--------------------------------------------------------------------------
     (dolist (vtable vtables) (hook-output vtable reason sequencer))))
 
 ;;;--------------------------------------------------------------------------


@@ -245,7 +244,7 @@ (defmethod hook-output progn ((vtable vtable) (reason (eql :h)) sequencer)
         (format stream "};~2%"))))
     (sequence-output (stream sequencer)
       ((class :vtable-externs)
         (format stream "};~2%"))))
     (sequence-output (stream sequencer)
       ((class :vtable-externs)

-       (format stream "~@<extern struct ~A ~2I~_~A__vtable_~A;~:>~%"
+       (format stream "~@<extern const struct ~A ~2I~_~A__vtable_~A;~:>~%"

               (vtable-struct-tag chain-tail chain-head)
               class (sod-class-nickname chain-head))))))
 
               (vtable-struct-tag chain-tail chain-head)
               class (sod-class-nickname chain-head))))))
 


@@ -280,22 +279,19 @@ (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)
   (let* ((method (method-entry-effective-method entry))
         (message (effective-method-message method))
         (class (effective-method-class method))
 (defmethod hook-output progn ((entry method-entry)
                              (reason (eql 'vtmsgs))
                              sequencer)
   (let* ((method (method-entry-effective-method entry))
         (message (effective-method-message method))
         (class (effective-method-class method))

-        (type (method-entry-function-type entry))
-        (commented-type (commentify-function-type type)))
+        (function-type (method-entry-function-type entry))
+        (commented-type (commentify-function-type function-type))
+        (pointer-type (make-pointer-type commented-type)))

     (sequence-output (stream sequencer)
       ((class :vtmsgs (sod-message-class message) :slots)
        (pprint-logical-block (stream nil :prefix "  " :suffix ";")
     (sequence-output (stream sequencer)
       ((class :vtmsgs (sod-message-class message) :slots)
        (pprint-logical-block (stream nil :prefix "  " :suffix ";")

-        (pprint-c-type commented-type stream (sod-message-name message)))
+        (pprint-c-type pointer-type stream (sod-message-name message)))

        (terpri stream)))))
 
 (defmethod hook-output progn ((cptr class-pointer)
        (terpri stream)))))
 
 (defmethod hook-output progn ((cptr class-pointer)


@@ -306,9 +302,8 @@ (defmethod hook-output progn ((cptr class-pointer)
       ((class :vtable chain-head :slots)
        (format stream "  const ~A *~:[_class~;~:*_cls_~A~];~%"
               metaclass
       ((class :vtable chain-head :slots)
        (format stream "  const ~A *~:[_class~;~:*_cls_~A~];~%"
               metaclass

-              (if (sod-class-direct-superclasses meta-chain-head)
-                  (sod-class-nickname meta-chain-head)
-                  nil))))))
+              (and (sod-class-direct-superclasses meta-chain-head)
+                   (sod-class-nickname meta-chain-head)))))))

 
 (defmethod hook-output progn ((boff base-offset) (reason (eql :h)) sequencer)
   (with-slots (class chain-head) boff
 
 (defmethod hook-output progn ((boff base-offset) (reason (eql :h)) sequencer)
   (with-slots (class chain-head) boff


@@ -360,7 +355,7 @@ (defmethod hook-output progn ((class sod-class) (reason (eql :c)) sequencer)
                      sequencer)))
 
 ;;;--------------------------------------------------------------------------
                      sequencer)))
 
 ;;;--------------------------------------------------------------------------

-;;; Direct methods.
+;;; Direct and effective methods.

 
 (defmethod hook-output progn ((method delegating-direct-method)
                              (reason (eql :c))
 
 (defmethod hook-output progn ((method delegating-direct-method)
                              (reason (eql :c))


@@ -420,10 +415,10 @@ (defmethod hook-output progn ((vtable vtable) (reason (eql :c)) sequencer)
                   (class :vtables :end))
       ((class :vtable chain-head :start)
        (format stream "/* Vtable for ~A chain. */~@
                   (class :vtables :end))
       ((class :vtable chain-head :start)
        (format stream "/* Vtable for ~A chain. */~@

-                      static const struct ~A ~A = {~%"
+                      const struct ~A ~A = {~%"

               chain-head
               (vtable-struct-tag chain-tail chain-head)
               chain-head
               (vtable-struct-tag chain-tail chain-head)

-              (vtable-name chain-tail chain-head)))
+              (vtable-name class chain-head)))

       ((class :vtable chain-head :end)
        (format stream "};~2%")))))
 
       ((class :vtable chain-head :end)
        (format stream "};~2%")))))
 


@@ -436,8 +431,12 @@ (defmethod hook-output progn ((cptr class-pointer)
                   (class :vtable chain-head :class-pointer metaclass)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :class-pointer metaclass)
                   (class :vtable chain-head :class-pointer metaclass)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :class-pointer metaclass)

-       (format stream "  &~A__classobj.~A.~A,~%"
-              (sod-class-metaclass class)
+       (format stream "  /* ~21@A = */ &~A__classobj.~A.~A,~%"
+              (if (sod-class-direct-superclasses meta-chain-head)
+                  (format nil "_cls_~A"
+                          (sod-class-nickname meta-chain-head))
+                  "_class")
+              class

               (sod-class-nickname meta-chain-head)
               (sod-class-nickname metaclass))))))
 
               (sod-class-nickname meta-chain-head)
               (sod-class-nickname metaclass))))))
 


@@ -448,7 +447,8 @@ (defmethod hook-output progn ((boff base-offset) (reason (eql :c)) sequencer)
                   (class :vtable chain-head :base-offset)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :base-offset)
                   (class :vtable chain-head :base-offset)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :base-offset)

-       (format stream "  offsetof(struct ~A, ~A),~%"
+       (format stream "  /* ~21@A = */ offsetof(struct ~A, ~A),~%"
+              "_base"

               (ilayout-struct-tag class)
               (sod-class-nickname chain-head))))))
 
               (ilayout-struct-tag class)
               (sod-class-nickname chain-head))))))
 


@@ -461,7 +461,8 @@ (defmethod hook-output progn ((choff chain-offset)
                   (class :vtable chain-head :chain-offset target-head)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :chain-offset target-head)
                   (class :vtable chain-head :chain-offset target-head)
                   (class :vtable chain-head :end))
       ((class :vtable chain-head :chain-offset target-head)

-       (format stream "  SOD_OFFSETDIFF(struct ~A, ~A, ~A),~%"
+       (format stream "  /* ~21@A = */ SOD_OFFSETDIFF(struct ~A, ~A, ~A),~%"
+              (format nil "_off_~A" (sod-class-nickname target-head))

               (ilayout-struct-tag class)
               (sod-class-nickname chain-head)
               (sod-class-nickname target-head))))))
               (ilayout-struct-tag class)
               (sod-class-nickname chain-head)
               (sod-class-nickname target-head))))))


@@ -489,7 +490,8 @@ (defmethod hook-output progn ((entry method-entry)
           (super (sod-message-class message)))
       (sequence-output (stream sequencer)
        ((class :vtable chain-head :vtmsgs super :slots)
           (super (sod-message-class message)))
       (sequence-output (stream sequencer)
        ((class :vtable chain-head :vtmsgs super :slots)

-        (format stream "    ~A,~%"
+        (format stream "    /* ~19@A = */ ~A,~%"
+                (sod-message-name message)

                 (method-entry-function-name method chain-head)))))))
 
 ;;;--------------------------------------------------------------------------
                 (method-entry-function-name method chain-head)))))))
 
 ;;;--------------------------------------------------------------------------


@@ -549,17 +551,23 @@ (defgeneric find-class-initializer (slot class)
 
 (defgeneric output-class-initializer (slot instance stream)
   (:method ((slot sod-class-effective-slot) (instance sod-class) stream)
 
 (defgeneric output-class-initializer (slot instance stream)
   (:method ((slot sod-class-effective-slot) (instance sod-class) stream)

-    (let ((func (effective-slot-initializer-function slot)))
+    (let ((func (effective-slot-initializer-function slot))
+         (direct-slot (effective-slot-direct-slot slot)))

       (if func
       (if func

-         (format stream "        ~A,~%" (funcall func instance))
+         (format stream "        /* ~15@A = */ ~A,~%"
+                 (sod-slot-name direct-slot)
+                 (funcall func instance))

          (call-next-method))))
   (:method ((slot effective-slot) (instance sod-class) stream)
          (call-next-method))))
   (:method ((slot effective-slot) (instance sod-class) stream)

-    (let ((init (find-class-initializer slot instance)))
+    (let ((init (find-class-initializer slot instance))
+         (direct-slot (effective-slot-direct-slot slot)))

       (ecase (sod-initializer-value-kind init)
       (ecase (sod-initializer-value-kind init)

-       (:simple (format stream "        ~A,~%"
+       (:simple (format stream "        /* ~15@A = */ ~A,~%"
+                        (sod-slot-name direct-slot)

                         (sod-initializer-value-form init)))
                         (sod-initializer-value-form init)))

-       (:compound (format stream "        ~@<{ ~;~A~; },~:>~%"
-                        (sod-initializer-value-form init)))))))
+       (:compound (format stream "        /* ~15@A = */ ~@<{ ~;~A~; },~:>~%"
+                          (sod-slot-name direct-slot)
+                          (sod-initializer-value-form init)))))))

 
 (defmethod hook-output progn ((slot sod-class-effective-slot)
                              (reason (eql 'class))
 
 (defmethod hook-output progn ((slot sod-class-effective-slot)
                              (reason (eql 'class))