src/module-parse.lisp: Reinstate `peek' around the main item parser.

[sod] / src / class-layout-impl.lisp

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 2e66fa11cb1a6ee56b3efae65434bac193f1497b..950db2b54bb0d9dcb400f5a6fe416ebe3d6bd61a 100644 (file)
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -68,9 +68,9 @@ (defmethod shared-initialize :after
     ((slot sod-class-slot) slot-names &key pset)
   (declare (ignore slot-names))
   (default-slot (slot 'initializer-function)
     ((slot sod-class-slot) slot-names &key pset)
   (declare (ignore slot-names))
   (default-slot (slot 'initializer-function)

-    (get-property pset :initializer-function t nil))
+    (get-property pset :initializer-function :func nil))

   (default-slot (slot 'prepare-function)
   (default-slot (slot 'prepare-function)

-    (get-property pset :prepare-function t nil)))
+    (get-property pset :prepare-function :func nil)))

 
 (export 'sod-class-effective-slot)
 (defclass sod-class-effective-slot (effective-slot)
 
 (export 'sod-class-effective-slot)
 (defclass sod-class-effective-slot (effective-slot)


@@ -104,9 +104,10 @@ (defmethod print-object ((method effective-method) stream)
 
 (defmethod print-object ((entry method-entry) stream)
   (maybe-print-unreadable-object (entry stream :type t)
 
 (defmethod print-object ((entry method-entry) stream)
   (maybe-print-unreadable-object (entry stream :type t)

-    (format stream "~A:~A"
+    (format stream "~A:~A~@[ ~S~]"

            (method-entry-effective-method entry)
            (method-entry-effective-method entry)

-           (sod-class-nickname (method-entry-chain-head entry)))))
+           (sod-class-nickname (method-entry-chain-head entry))
+           (method-entry-role entry))))

 
 (defmethod compute-sod-effective-method
     ((message sod-message) (class sod-class))
 
 (defmethod compute-sod-effective-method
     ((message sod-message) (class sod-class))


@@ -130,6 +131,7 @@ (defmethod compute-effective-methods ((class sod-class))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'effective-methods)))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'effective-methods)))

+  (declare (ignore clos-class))

   (setf (slot-value class 'effective-methods)
        (compute-effective-methods class)))
 
   (setf (slot-value class 'effective-methods)
        (compute-effective-methods class)))
 


@@ -207,6 +209,7 @@ (defmethod compute-ilayout ((class sod-class))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'ilayout)))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'ilayout)))

+  (declare (ignore clos-class))

   (setf (slot-value class 'ilayout)
        (compute-ilayout class)))
 
   (setf (slot-value class 'ilayout)
        (compute-ilayout class)))
 


@@ -227,17 +230,17 @@ (defmethod compute-vtmsgs
      (subclass sod-class)
      (chain-head sod-class)
      (chain-tail sod-class))
      (subclass sod-class)
      (chain-head sod-class)
      (chain-tail sod-class))

-  (flet ((make-entry (message)
+  (flet ((make-entries (message)

           (let ((method (find message
                               (sod-class-effective-methods subclass)
                               :key #'effective-method-message)))
           (let ((method (find message
                               (sod-class-effective-methods subclass)
                               :key #'effective-method-message)))

-            (make-method-entry method chain-head chain-tail))))
+            (make-method-entries method chain-head chain-tail))))

     (make-instance 'vtmsgs
                   :class class
                   :subclass subclass
                   :chain-head chain-head
                   :chain-tail chain-tail
     (make-instance 'vtmsgs
                   :class class
                   :subclass subclass
                   :chain-head chain-head
                   :chain-tail chain-tail

-                  :entries (mapcar #'make-entry
+                  :entries (mapcan #'make-entries

                                    (sod-class-messages class)))))
 
 ;;; class-pointer
                                    (sod-class-messages class)))))
 
 ;;; class-pointer


@@ -389,6 +392,7 @@ (defmethod compute-vtables ((class sod-class))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'vtables)))
 
 (defmethod slot-unbound
     (clos-class (class sod-class) (slot-name (eql 'vtables)))

+  (declare (ignore clos-class))

   (setf (slot-value class 'vtables)
        (compute-vtables class)))
 
   (setf (slot-value class 'vtables)
        (compute-vtables class)))