src/class-{finalize,layout}-*.lisp: Relocate layout interface code.

Establishing the layout is now the responsibility of the layout code.
Not sure what made me put it anywhere else.

diff --git a/src/class-finalize-impl.lisp b/src/class-finalize-impl.lisp
index aea50583f97964d8b8ca616cf49a456eaa65f8db..a51075b6d94245aafe8ca8582d849eec462659c9 100644 (file)
--- a/src/class-finalize-impl.lisp
+++ b/src/class-finalize-impl.lisp
@@ -484,18 +484,4 @@        (default-slot (class 'metaclass) (guess-metaclass class))
       (:finalized
        t))))
 
-(flet ((check-class-is-finalized (class)
-        (unless (eq (sod-class-state class) :finalized)
-          (error "Class ~S is not finalized" class))))
-  (macrolet ((define-layout-slot (slot (class) &body body)
-              `(define-on-demand-slot sod-class ,slot (,class)
-                 (check-class-is-finalized ,class)
-                 ,@body)))
-    (define-layout-slot %ilayout (class)
-      (compute-ilayout class))
-    (define-layout-slot effective-methods (class)
-      (compute-effective-methods class))
-    (define-layout-slot vtables (class)
-      (compute-vtables class))))
-
 ;;;----- That's all, folks --------------------------------------------------

diff --git a/src/class-layout-impl.lisp b/src/class-layout-impl.lisp
index d6b3e6da3064e0260d388f55ec2ae929df722798..452e683c74eee759eacd30a9379ec1dc47ef92f5 100644 (file)
--- a/src/class-layout-impl.lisp
+++ b/src/class-layout-impl.lisp
@@ -388,4 +388,22 @@ (defmethod compute-vtables ((class sod-class))
            (compute-vtable class (reverse chain)))
          (sod-class-chains class)))
 
+;;;--------------------------------------------------------------------------
+;;; Layout interface.
+
+;; Just arrange to populate the necessary slots on demand.
+(flet ((check-class-is-finalized (class)
+        (unless (eq (sod-class-state class) :finalized)
+          (error "Class ~S is not finalized" class))))
+    (macrolet ((define-layout-slot (slot (class) &body body)
+              `(define-on-demand-slot sod-class ,slot (,class)
+                 (check-class-is-finalized ,class)
+                 ,@body)))
+    (define-layout-slot %ilayout (class)
+      (compute-ilayout class))
+    (define-layout-slot effective-methods (class)
+      (compute-effective-methods class))
+    (define-layout-slot vtables (class)
+      (compute-vtables class))))
+
 ;;;----- That's all, folks --------------------------------------------------