src/: Rename the various `:lisp-class' properties.

[sod] / src / module-impl.lisp

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index 5343ad08650fc77cd911d433b2f80a43e80d0df7..9e74b2703f7cbbe908493485cb3f5d92249c065f 100644 (file)
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -45,7 +45,7 @@ (defmethod shared-initialize :after ((module module) slot-names &key pset)
 
 (defmethod finalize-module ((module module))
   (let* ((pset (module-pset module))
-        (class (get-property pset :lisp-class :symbol 'module)))
+        (class (get-property pset :module-class :symbol 'module)))
 
     ;; Always call `change-class', even if it's the same one; this will
     ;; exercise the property-set fiddling in `shared-initialize' and we can
@@ -84,13 +84,26 @@ (defun build-module
     (when truename
       (setf (gethash truename *module-map*) *module*))
     (unwind-protect
-        (call-with-module-environment (lambda ()
-                                        (module-import *builtin-module*)
-                                        (funcall thunk)
-                                        (finalize-module *module*)))
+        (with-module-environment ()
+          (module-import *builtin-module*)
+          (funcall thunk)
+          (finalize-module *module*))
       (when (and truename (not (eq (module-state *module*) t)))
        (remhash truename *module-map*)))))
 
+(defun call-with-module-environment (thunk &optional (module *module*))
+  "Invoke THUNK with bindings for the module variables in scope.
+
+   This is the guts of `with-module-environment', which you should probably
+   use instead."
+  (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*)))))
+
 (defun call-with-temporary-module (thunk)
   "Invoke THUNK in the context of a temporary module, returning its values.
 
@@ -99,10 +112,9 @@ (defun call-with-temporary-module (thunk)
   (let ((*module* (make-instance 'module
                                 :name "<temp>"
                                 :state nil)))
-    (call-with-module-environment
-     (lambda ()
-       (module-import *builtin-module*)
-       (funcall thunk)))))
+    (with-module-environment ()
+      (module-import *builtin-module*)
+      (funcall thunk))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Type definitions.
@@ -161,7 +173,8 @@ (defun output-c-excursion (stream location thunk)
             (fresh-line stream)
             (format stream "~&#line ~D ~S~%"
                     (1+ (position-aware-stream-line stream))
-                    (namestring (stream-pathname stream)))))
+                    (let ((path (stream-pathname stream)))
+                      (if path (namestring path) "<sod-output>")))))
          (t
           (funcall thunk)))))