src/class-layout-impl.lisp: Abstract out `sod-message-applicable-methods'.

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

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 119996eb20149d06237684be3bec4109ef918e4a..7ff46679b818cec6e397b50e65b5bdf474c29def 100644 (file)
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -127,14 +127,18 @@ (defmethod print-object ((entry method-entry) stream)
            (sod-class-nickname (method-entry-chain-head entry))
            (method-entry-role entry))))
 
            (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))
 (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
     (make-instance (sod-message-effective-method-class message)
                   :message message
                   :class class