src/module-impl.lisp (find-file): Take a home path rather than a scanner.

Honestly, picking the home path out of the scanner input was always a
bit of a stretch.

Obviously, we also need to fix up the callers, but there's only one of
them.

diff --git a/doc/module.tex b/doc/module.tex
index 25684812b9542d62b20212ba3e50654ddeb0b84d..67bf377fbbeda89d766381a894357fba0f09f291 100644 (file)
--- a/doc/module.tex
+++ b/doc/module.tex
@@ -102,7 +102,7 @@
 \begin{describe}{var}{*module-dirs*}
 \end{describe}
 
 \begin{describe}{var}{*module-dirs*}
 \end{describe}
 

-\begin{describe}{fun}{find-file @<scanner> @<name> @<what> @<thunk>}
+\begin{describe}{fun}{find-file @<home> @<name> @<what> @<thunk>}

 \end{describe}
 
 \begin{describe}{fun}
 \end{describe}
 
 \begin{describe}{fun}

diff --git a/src/module-impl.lisp b/src/module-impl.lisp
index 268f4bc31483083475c90dc884697ff9476f9a08..44aa0b8e7e0007d37eba578d1ec4af76abdcfc10 100644 (file)
--- a/src/module-impl.lisp
+++ b/src/module-impl.lisp
@@ -228,10 +228,10 @@ (defparameter *module-dirs* nil
    See `find-file' for the grubby details.")
 
 (export 'find-file)
    See `find-file' for the grubby details.")
 
 (export 'find-file)

-(defun find-file (scanner name what thunk)
+(defun find-file (home name what thunk)

   "Find a file called NAME on the module search path, and call THUNK on it.
 
   "Find a file called NAME on the module search path, and call THUNK on it.
 

-   The file is searched for relative to the SCANNER's current file, and also
+   The file is searched for relative to the HOME file or directory, and also

    in the directories mentioned in the `*module-dirs*' list.  If the file is
    found, then THUNK is invoked with two arguments: the name we used to find
    it (which might be relative to the starting directory) and the truename
    in the directories mentioned in the `*module-dirs*' list.  If the file is
    found, then THUNK is invoked with two arguments: the name we used to find
    it (which might be relative to the starting directory) and the truename


@@ -245,8 +245,7 @@ (defun find-file (scanner name what thunk)
    THUNK is not invoked with any additional handlers defined."
 
   (handler-case
    THUNK is not invoked with any additional handlers defined."
 
   (handler-case

-      (dolist (dir (cons (pathname (scanner-filename scanner)) *module-dirs*)
-              (values nil nil))
+      (dolist (dir (cons home *module-dirs*) (values nil nil))

        (let* ((path (merge-pathnames name dir))
               (probe (probe-file path)))
          (when probe
        (let* ((path (merge-pathnames name dir))
               (probe (probe-file path)))
          (when probe

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index 81a39565d32bbbc51c1036df6e2b54d68692e4b6..df058bee46bc179b69181dd2dab942d65cdc1d28 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -141,7 +141,7 @@ (define-pluggable-parser module file (scanner pset)
   (declare (ignore pset))
   (flet ((common (name type what thunk)
           (when name
   (declare (ignore pset))
   (flet ((common (name type what thunk)
           (when name

-            (find-file scanner
+            (find-file (pathname (scanner-filename scanner))

                        (merge-pathnames name
                                         (make-pathname :type type
                                                        :case :common))
                        (merge-pathnames name
                                         (make-pathname :type type
                                                        :case :common))