X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/287e744e9aa96b8eebeb530b68e2854e8ffe5580..85aa8b3e6716fedd4617dc8d76cd459c8a38cdc5:/src/module-impl.lisp diff --git a/src/module-impl.lisp b/src/module-impl.lisp index 4da7804..44aa0b8 100644 --- a/src/module-impl.lisp +++ b/src/module-impl.lisp @@ -152,16 +152,6 @@ ;;;-------------------------------------------------------------------------- ;;; Code fragments. -(export '(c-fragment c-fragment-text)) -(defclass c-fragment () - ((location :initarg :location :type file-location :reader file-location) - (text :initarg :text :type string :reader c-fragment-text)) - (: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.")) - (defun output-c-excursion (stream location func) "Invoke FUNC surrounding it by writing #line markers to STREAM. @@ -238,10 +228,10 @@ 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. - 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 @@ -255,8 +245,7 @@ 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