X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/1645e4335e58ef3a8f1cafb1834e93760d80d9ae..287e744e9aa96b8eebeb530b68e2854e8ffe5580:/src/module-impl.lisp

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index ba04397..4da7804 100644
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -56,8 +56,10 @@
 ;;;--------------------------------------------------------------------------
 ;;; 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 @@
     (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 @@
   (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,32 +159,38 @@
   (: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 thunk)
-  "Invoke THUNK surrounding it by writing #line markers to STREAM.
+(defun output-c-excursion (stream location func)
+  "Invoke FUNC surrounding it by writing #line markers to STREAM.
 
    The first marker describes LOCATION; the second refers to the actual
    output position in STREAM.  If LOCATION doesn't provide a line number then
    no markers are output after all.  If the output stream isn't
-   position-aware then no final marker is output."
-
-  (let* ((location (file-location location))
-	 (line (file-location-line location))
-	 (filename (file-location-filename location)))
-    (cond (line
-	   (when (typep stream 'position-aware-stream)
-	     (format stream "~&#line ~D~@[ ~S~]~%" line filename))
-	   (funcall thunk)
-	   (when (typep stream 'position-aware-stream)
-	     (fresh-line stream)
-	     (format stream "~&#line ~D ~S~%"
-		     (1+ (position-aware-stream-line stream))
-		     (let ((path (stream-pathname stream)))
-		       (if path (namestring path) "<sod-output>")))))
-	  (t
-	   (funcall thunk)))))
+   position-aware then no final marker is output.
+
+   FUNC is passed the output stream as an argument.  Complicated games may be
+   played with interposed streams.  Try not to worry about it."
+
+  (flet ((doit (stream)
+	   (let* ((location (file-location location))
+		  (line (file-location-line location))
+		  (filename (file-location-filename location)))
+	     (cond (line
+		    (when (typep stream 'position-aware-stream)
+		      (format stream "~&#line ~D~@[ ~S~]~%" line filename))
+		    (funcall func stream)
+		    (when (typep stream 'position-aware-stream)
+		      (fresh-line stream)
+		      (format stream "#line ~D ~S~%"
+			      (1+ (position-aware-stream-line stream))
+			      (let ((path (stream-pathname stream)))
+				(if path (namestring path)
+				    "<sod-output>")))))
+		   (t
+		    (funcall func stream))))))
+    (print-ugly-stuff stream #'doit)))
 
 (defmethod print-object ((fragment c-fragment) stream)
   (let ((text (c-fragment-text fragment))
@@ -191,7 +205,7 @@
 		 (prin1 (subseq text 0 37) stream)
 		 (write-string "..." stream))))
 	(output-c-excursion stream location
-			    (lambda () (write-string text stream))))))
+			    (lambda (stream) (write-string text stream))))))
 
 (defmethod make-load-form ((fragment c-fragment) &optional environment)
   (make-load-form-saving-slots fragment :environment environment))