From 44232c3d82341ba2656c06f0f848e76a6f36c1ab Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Thu, 19 Jun 2008 20:58:05 +0000 Subject: [PATCH] Create a new search-list "ext-formats" that is initialized to "library:ext-formats/". This makes it easier to add new directories where external formats can be found. The previous use made it difficult because the formats had to be in the subdirectory ext-formats. save.lisp: o Create and initialize new search-list. extfmts.lisp: o Use the new search-list instead of "library:ext-formats/". --- code/extfmts.lisp | 10 +++------- code/save.lisp | 6 ++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/extfmts.lisp b/code/extfmts.lisp index 606793ef3..f0a4e771a 100644 --- a/code/extfmts.lisp +++ b/code/extfmts.lisp @@ -5,7 +5,7 @@ ;;; domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extfmts.lisp,v 1.3 2008/06/19 01:41:34 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extfmts.lisp,v 1.4 2008/06/19 20:58:05 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -111,7 +111,7 @@ (defun load-external-format-aliases () (let ((*package* (find-package "KEYWORD"))) - (with-open-file (stm "library:ext-formats/aliases" :if-does-not-exist nil) + (with-open-file (stm "ext-formats:aliases" :if-does-not-exist nil) (when stm (do ((alias (read stm nil stm) (read stm nil stm)) (value (read stm nil stm) (read stm nil stm))) @@ -124,10 +124,6 @@ alias value))))))) (defun %find-external-format (name) - #+(or) - (unless (ext:search-list-defined-p "ef:") - (setf (ext:search-list "ef:") '("library:ef/"))) - (when (zerop (hash-table-count *external-format-aliases*)) (setf (gethash :latin1 *external-format-aliases*) :iso8859-1) (setf (gethash :latin-1 *external-format-aliases*) :iso8859-1) @@ -145,7 +141,7 @@ (or (gethash name *external-formats*) (and (let ((*package* (find-package "STREAM")) (lisp::*enable-package-locked-errors* nil)) - (load (format nil "library:ext-formats/~(~A~)" name) + (load (format nil "ext-formats:~(~A~)" name) :if-does-not-exist nil)) (gethash name *external-formats*)))) diff --git a/code/save.lisp b/code/save.lisp index e5650dee3..c2249c799 100644 --- a/code/save.lisp +++ b/code/save.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.56 2007/07/21 21:12:18 fgilham Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.57 2008/06/19 20:58:05 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -113,7 +113,9 @@ '("/usr/local/lib/cmucl/lib/")))) (setf (search-list "modules:") '("library:subsystems/")) (setf (search-list "ld-library-path:") - (parse-unix-search-list :ld_library_path))) + (parse-unix-search-list :ld_library_path)) + (setf (search-list "ext-formats:") + '("library:ext-formats/"))) -- GitLab