X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/6e6b09589b6f6d0b260fd022e6a3b189f7f7d352..e85df3ff84611b7c790f9ffb46dfca77e2a717c0:/src/class-layout-impl.lisp

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 8edfcf6..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 @@ (defmethod compute-effective-slot ((class sod-class) (slot sod-slot))
 ;;;--------------------------------------------------------------------------
 ;;; 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)
@@ -116,8 +117,8 @@ (defmethod compute-sod-effective-method
 					   (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)))
@@ -129,9 +130,6 @@ (defmethod compute-effective-methods ((class sod-class))
 		    (sod-class-messages super)))
 	  (sod-class-precedence-list class)))
 
-(define-on-demand-slot sod-class effective-methods (class)
-  (compute-effective-methods class))
-
 ;;;--------------------------------------------------------------------------
 ;;; Instance layout.
 
@@ -204,9 +202,6 @@ (defmethod compute-ilayout ((class sod-class))
 						    (reverse chain)))
 				  (sod-class-chains class))))
 
-(define-on-demand-slot sod-class %ilayout (class)
-  (compute-ilayout class))
-
 ;;;--------------------------------------------------------------------------
 ;;; Vtable layout.
 
@@ -384,7 +379,4 @@ (defmethod compute-vtables ((class sod-class))
 	    (compute-vtable class (reverse chain)))
 	  (sod-class-chains class)))
 
-(define-on-demand-slot sod-class vtables (class)
-  (compute-vtables class))
-
 ;;;----- That's all, folks --------------------------------------------------