src/: Style cleanup: use constant names for types where available.

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

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index 26782e27da1bd7de7a519d131c883cc5c3c801af..3779a69e013a1ef45e36e174ea8878bbb3936745 100644 (file)
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
 
 ;;;----- 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
 ;;;
 ;;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; 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)
 (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-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)))
                   :message message
                   :class class
                   :direct-methods direct-methods)))


@@ -129,12 +130,6 @@ (defmethod compute-effective-methods ((class sod-class))
                    (sod-class-messages super)))
          (sod-class-precedence-list class)))
 
                    (sod-class-messages super)))
          (sod-class-precedence-list class)))
 

-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql 'effective-methods)))
-  (declare (ignore clos-class))
-  (setf (slot-value class 'effective-methods)
-       (compute-effective-methods class)))
-

 ;;;--------------------------------------------------------------------------
 ;;; Instance layout.
 
 ;;;--------------------------------------------------------------------------
 ;;; Instance layout.
 


@@ -207,11 +202,6 @@ (defmethod compute-ilayout ((class sod-class))
                                                    (reverse chain)))
                                  (sod-class-chains class))))
 
                                                    (reverse chain)))
                                  (sod-class-chains class))))
 

-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql '%ilayout)))
-  (declare (ignore clos-class))
-  (setf (slot-value class '%ilayout) (compute-ilayout class)))
-

 ;;;--------------------------------------------------------------------------
 ;;; Vtable layout.
 
 ;;;--------------------------------------------------------------------------
 ;;; Vtable layout.
 


@@ -389,10 +379,4 @@ (defmethod compute-vtables ((class sod-class))
            (compute-vtable class (reverse chain)))
          (sod-class-chains class)))
 
            (compute-vtable class (reverse chain)))
          (sod-class-chains class)))
 

-(defmethod slot-unbound
-    (clos-class (class sod-class) (slot-name (eql 'vtables)))
-  (declare (ignore clos-class))
-  (setf (slot-value class 'vtables)
-       (compute-vtables class)))
-

 ;;;----- That's all, folks --------------------------------------------------
 ;;;----- That's all, folks --------------------------------------------------