From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 26 Mar 2017 14:16:18 +0000 (+0100)
Subject: src/class-{finalize,layout}-*.lisp: Relocate layout interface code.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/00091ab3d552b0ab7bc177e19e86110d8c1cd20b

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 aea5058..a51075b 100644
--- 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 d6b3e6d..452e683 100644
--- 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 --------------------------------------------------