X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/00091ab3d552b0ab7bc177e19e86110d8c1cd20b..9b9ad6b931736323a34123c11edfdff97a22623e:/src/class-layout-impl.lisp

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 452e683..e93f401 100644
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -56,6 +56,14 @@
 		 :initializer (find-slot-initializer class slot)
 		 :initargs (find-slot-initargs class slot)))
 
+(defmethod find-class-initializer ((slot effective-slot) (class sod-class))
+  (let ((dslot (effective-slot-direct-slot slot)))
+    (or (some (lambda (super)
+		(find dslot (sod-class-class-initializers super)
+		      :key #'sod-initializer-slot))
+	      (sod-class-precedence-list class))
+	(effective-slot-initializer slot))))
+
 ;;;--------------------------------------------------------------------------
 ;;; Special-purpose slot objects.
 
@@ -82,7 +90,9 @@
   (default-slot (slot 'prepare-function)
     (get-property pset :prepare-function :func nil)))
 
-(export 'sod-class-effective-slot)
+(export '(sod-class-effective-slot
+	  effective-slot-initializer-function
+	  effective-slot-prepare-function))
 (defclass sod-class-effective-slot (effective-slot)
   ((initializer-function :initarg :initializer-function
 			 :type (or symbol function)
@@ -119,14 +129,18 @@
 	    (sod-class-nickname (method-entry-chain-head entry))
 	    (method-entry-role entry))))
 
+(defmethod sod-message-applicable-methods
+    ((message sod-message) (class sod-class))
+  (mappend (lambda (super)
+	     (remove message
+		     (sod-class-methods super)
+		     :key #'sod-method-message
+		     :test-not #'eql))
+	   (sod-class-precedence-list class)))
+
 (defmethod compute-sod-effective-method
     ((message sod-message) (class sod-class))
-  (let ((direct-methods (mappend (lambda (super)
-				   (remove message
-					   (sod-class-methods super)
-					   :key #'sod-method-message
-					   :test-not #'eql))
-				 (sod-class-precedence-list class))))
+  (let ((direct-methods (sod-message-applicable-methods message class)))
     (make-instance (sod-message-effective-method-class message)
 		   :message message
 		   :class class