From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 22 Sep 2015 10:27:11 +0000 (+0100)
Subject: src/module-impl.lisp: Don't require `finalize-module' to return the module.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/8ce92a8fe2d825830035b39a3dfd60969445e7ea

src/module-impl.lisp: Don't require `finalize-module' to return the module.

Returning the correct module object is now the responsibility of
`build-module'.
---

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index c15edda..0bf9ff2 100644
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -51,8 +51,7 @@ (defmethod finalize-module ((module module))
     ;; exercise the property-set fiddling in `shared-initialize' and we can
     ;; catch unknown-property errors.
     (change-class module class :state t :pset pset)
-    (check-unused-properties pset)
-    module))
+    (check-unused-properties pset)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Module objects.
@@ -87,7 +86,8 @@ (defun build-module
 	 (with-module-environment ()
 	   (module-import *builtin-module*)
 	   (funcall thunk)
-	   (finalize-module *module*))
+	   (finalize-module *module*)
+	   *module*)
       (when (and truename (not (eq (module-state *module*) t)))
 	(remhash truename *module-map*)))))