X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/08b6e064ab3b18bbc5a9af47418c02f0e7ebc52d..9c29a20fc74f6a5710a83cdb17d3e8814de4605e:/src/module-impl.lisp

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index 908a017..4da7804 100644
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -56,8 +56,10 @@ (defmethod finalize-module ((module module))
 ;;;--------------------------------------------------------------------------
 ;;; Module objects.
 
-(defparameter *module-map* (make-hash-table :test #'equal)
+(defvar-unbound *module-map*
   "Hash table mapping true names to module objects.")
+(define-clear-the-decks reset-module-map
+  (setf *module-map* (make-hash-table :test #'equal)))
 
 (defun build-module
     (name thunk &key (truename (probe-file name)) location)
@@ -71,9 +73,11 @@ (defun build-module
     (let ((existing (gethash truename *module-map*)))
       (cond ((null existing))
 	    ((eq (module-state existing) t)
+	     (when (plusp (module-errors existing))
+	       (error "Module `~A' contains errors" name))
 	     (return-from build-module existing))
 	    (t
-	     (error "Module ~A already being imported at ~A"
+	     (error "Module `~A' already being imported at ~A"
 		    name (module-state existing))))))
 
   ;; Construct the new module.
@@ -99,10 +103,14 @@ (defun call-with-module-environment (thunk &optional (module *module*))
   (progv
       (mapcar #'car *module-bindings-alist*)
       (module-variables module)
-    (unwind-protect (funcall thunk)
-      (setf (module-variables module)
-	    (mapcar (compose #'car #'symbol-value)
-		    *module-bindings-alist*)))))
+    (handler-bind ((error (lambda (cond)
+			    (declare (ignore cond))
+			    (incf (slot-value module 'errors))
+			    :decline)))
+      (unwind-protect (funcall thunk)
+	(setf (module-variables module)
+	      (mapcar (compose #'car #'symbol-value)
+		      *module-bindings-alist*))))))
 
 (defun call-with-temporary-module (thunk)
   "Invoke THUNK in the context of a temporary module, returning its values.
@@ -151,8 +159,8 @@ (defclass c-fragment ()
   (:documentation
    "Represents a fragment of C code to be written to an output file.
 
-   A C fragment is aware of its original location, and will bear proper #line
-   markers when written out."))
+   A C fragment is aware of its original location, and will bear proper
+   `#line' markers when written out."))
 
 (defun output-c-excursion (stream location func)
   "Invoke FUNC surrounding it by writing #line markers to STREAM.
@@ -205,7 +213,8 @@ (defmethod make-load-form ((fragment c-fragment) &optional environment)
 (export '(code-fragment-item code-fragment code-fragment-reason
 	  code-fragment-name code-fragment-constraints))
 (defclass code-fragment-item ()
-  ((fragment :initarg :fragment :type c-fragment :reader code-fragment)
+  ((fragment :initarg :fragment :type (or string c-fragment)
+	     :reader code-fragment)
    (reason :initarg :reason :type keyword :reader code-fragment-reason)
    (name :initarg :name :type t :reader code-fragment-name)
    (constraints :initarg :constraints :type list