X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/aa14a4cddcb96b681d5c19a2ec8bad382f43b264..54fa3df9560fe739b5fe20ca561749092cef0fd5:/src/class-layout-impl.lisp

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 4bff54d..3779a69 100644
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -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)
@@ -58,7 +59,7 @@
    (prepare-function :initarg :prepare-function :type (or symbol function)
 		     :reader sod-slot-prepare-function))
   (:documentation
-   "Special class for slots defined on SodClass.
+   "Special class for slots defined on `SodClass'.
 
    These slots need class-specific initialization.  It's easier to keep all
    of the information (name, type, and how to initialize them) about these
@@ -68,9 +69,9 @@
     ((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)
-    (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)
@@ -80,7 +81,7 @@
    (prepare-function :initarg :prepare-function :type (or symbol function)
 		     :reader effective-slot-prepare-function))
   (:documentation
-   "Special class for slots defined on SodClass.
+   "Special class for slots defined on `SodClass'.
 
    This class ignores any explicit initializers and computes initializer
    values using the slot's INIT-FUNC slot and a magical protocol during
@@ -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))
@@ -115,8 +117,8 @@
 					   (sod-class-methods super)
 					   :key #'sod-method-message
 					   :test-not #'eql))
-				(sod-class-precedence-list class))))
-    (make-instance (message-effective-method-class message)
+				 (sod-class-precedence-list class))))
+    (make-instance (sod-message-effective-method-class message)
 		   :message message
 		   :class class
 		   :direct-methods direct-methods)))
@@ -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 --------------------------------------------------