X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/ea578bb4b9eb4a03b2eb4ed151e058d699c216ea..f7227b1a3d7052c17e6989b52170d8fa1a5d0a85:/src/class-layout-impl.lisp?ds=sidebyside

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 68c989b..fb684b7 100644
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -50,7 +50,8 @@
 ;;;--------------------------------------------------------------------------
 ;;; Special-purpose slot objects.
 
-(export 'sod-class-slot)
+(export '(sod-class-slot
+	  sod-slot-initializer-function sod-slot-prepare-function))
 (defclass sod-class-slot (sod-slot)
   ((initializer-function :initarg :initializer-function
 			 :type (or symbol function)
@@ -104,9 +105,10 @@
 
 (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)
-	    (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))
@@ -128,11 +130,6 @@
 		    (sod-class-messages super)))
 	  (sod-class-precedence-list class)))
 
-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql 'effective-methods)))
-  (setf (slot-value class 'effective-methods)
-	(compute-effective-methods class)))
-
 ;;;--------------------------------------------------------------------------
 ;;; Instance layout.
 
@@ -205,11 +202,6 @@
 						    (reverse chain)))
 				  (sod-class-chains class))))
 
-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql 'ilayout)))
-  (setf (slot-value class 'ilayout)
-	(compute-ilayout class)))
-
 ;;;--------------------------------------------------------------------------
 ;;; Vtable layout.
 
@@ -227,17 +219,17 @@
      (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)))
-	     (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
-		   :entries (mapcar #'make-entry
+		   :entries (mapcan #'make-entries
 				    (sod-class-messages class)))))
 
 ;;; class-pointer
@@ -387,9 +379,4 @@
 	    (compute-vtable class (reverse chain)))
 	  (sod-class-chains class)))
 
-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql 'vtables)))
-  (setf (slot-value class 'vtables)
-	(compute-vtables class)))
-
 ;;;----- That's all, folks --------------------------------------------------