From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: src/class-finalize-impl.lisp: Reorder `flet'/`macrolet'.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/d1cf6f0eb28e9f887b7f02d7debd0b363b1ad431?hp=--cc

src/class-finalize-impl.lisp: Reorder `flet'/`macrolet'.

The `macrolet' macro expansion explicitly references the function
defined in the `flet' form, so probably they should be the other way
out.
---

d1cf6f0eb28e9f887b7f02d7debd0b363b1ad431
diff --git a/src/class-finalize-impl.lisp b/src/class-finalize-impl.lisp
index 23d7107..36d56e0 100644
--- a/src/class-finalize-impl.lisp
+++ b/src/class-finalize-impl.lisp
@@ -431,13 +431,13 @@        (default-slot (class 'metaclass) (guess-metaclass class))
       (:finalized
        t))))
 
-(macrolet ((define-layout-slot (slot (class) &body body)
-	     `(define-on-demand-slot sod-class ,slot (,class)
-		(check-class-is-finalized ,class)
-		,@body)))
-  (flet ((check-class-is-finalized (class)
-	   (unless (eq (sod-class-state class) :finalized)
-	     (error "Class ~S is not finalized" class))))
+(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)