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 2e66fa11cb1a6ee56b3efae65434bac193f1497b..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)


@@ -68,9 +69,9 @@ (defmethod shared-initialize :after
     ((slot sod-class-slot) slot-names &key pset)
   (declare (ignore slot-names))
   (default-slot (slot 'initializer-function)
     ((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)
   (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)
 
 (export 'sod-class-effective-slot)
 (defclass sod-class-effective-slot (effective-slot)


@@ -104,9 +105,10 @@ (defmethod print-object ((method effective-method) stream)
 
 (defmethod print-object ((entry method-entry) stream)
   (maybe-print-unreadable-object (entry stream :type t)
 
 (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)
            (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))
 
 (defmethod compute-sod-effective-method
     ((message sod-message) (class sod-class))


@@ -115,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)))


@@ -128,11 +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)))
-  (setf (slot-value class 'effective-methods)
-       (compute-effective-methods class)))
-

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


@@ -205,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)))
-  (setf (slot-value class 'ilayout)
-       (compute-ilayout class)))
-

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


@@ -227,17 +219,17 @@ (defmethod compute-vtmsgs
      (subclass sod-class)
      (chain-head sod-class)
      (chain-tail sod-class))
      (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)))
           (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
     (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
                                    (sod-class-messages class)))))
 
 ;;; class-pointer


@@ -387,9 +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)))
-  (setf (slot-value class 'vtables)
-       (compute-vtables class)))
-

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