X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/b3354e08ea601fe2420c15a9a16d1f6d5b98a897..ad1316527a6aa066d0abc0ada46a3616f5cb451f:/src/module-impl.lisp

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index c15edda..3ca4411 100644
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -51,8 +51,7 @@
     ;; 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 @@
 	 (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*)))))
 
@@ -154,29 +154,35 @@
    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 +197,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))
@@ -199,7 +205,8 @@
 (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