0.pre7.37:

[sbcl.git] / src / code / pathname.lisp

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 7b44fae..67b442a 100644 (file)
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -26,20 +26,31 @@
   (customary-case (required-argument) :type (member :upper :lower)))
 
 (def!struct (logical-host
-                 (:include host
-                           (:parse #'parse-logical-namestring)
-                           (:unparse #'unparse-logical-namestring)
-                           (:unparse-host
-                            (lambda (x)
-                              (logical-host-name (%pathname-host x))))
-                           (:unparse-directory #'unparse-logical-directory)
-                           (:unparse-file #'unparse-unix-file)
-                           (:unparse-enough #'unparse-enough-namestring)
-                           (:customary-case :upper)))
+            (:make-load-form-fun make-logical-host-load-form-fun)
+            (:include host
+                      (:parse #'parse-logical-namestring)
+                      (:unparse #'unparse-logical-namestring)
+                      (:unparse-host
+                       (lambda (x)
+                         (logical-host-name (%pathname-host x))))
+                      (:unparse-directory #'unparse-logical-directory)
+                      (:unparse-file #'unparse-unix-file)
+                      (:unparse-enough #'unparse-enough-namestring)
+                      (:customary-case :upper)))
   (name "" :type simple-base-string)
   (translations nil :type list)
   (canon-transls nil :type list))
 
+(def!method print-object ((logical-host logical-host) stream)
+  (print-unreadable-object (logical-host stream :type t)
+    (prin1 (logical-host-name logical-host) stream)))
+
+;;; What would it mean to dump a logical host and reload it into
+;;; another Lisp image? It's not clear, so we don't support it.
+(defun make-logical-host-load-form-fun (logical-host)
+  (error "~@<A logical host can't be dumped as a constant: ~2I~_~S~:>"
+         logical-host))
+
 ;;; A PATTERN is a list of entries and wildcards used for pattern
 ;;; matches of translations.
 (sb!xc:defstruct (pattern (:constructor make-pattern (pieces)))
@@ -74,6 +85,12 @@
   ;; on standard Unix filesystems)
   (version nil :type (or integer pathname-component-tokens (member :newest))))
 
+;;; Return a value suitable, e.g., for preinitializing
+;;; *DEFAULT-PATHNAME-DEFAULTS* before *DEFAULT-PATHNAME-DEFAULTS* is
+;;; initialized (at which time we can't safely call e.g. #'PATHNAME).
+(defun make-trivial-default-pathname ()
+  (%make-pathname *unix-host* nil nil nil nil :newest))
+
 ;;; Logical pathnames have the following format:
 ;;;
 ;;; logical-namestring ::=
@@ -90,7 +107,7 @@
 ;;;
 ;;; Physical pathnames include all these slots and a device slot.
 
-;;; Logical pathnames are a subclass of pathname. Their class
+;;; Logical pathnames are a subclass of PATHNAME. Their class
 ;;; relations are mimicked using structures for efficency.
 (sb!xc:defstruct (logical-pathname (:conc-name %logical-pathname-)
                                   (:include pathname)
@@ -101,19 +118,3 @@
                                                  name
                                                  type
                                                  version))))
-\f
-(defmacro-mundanely enumerate-search-list ((var pathname &optional result)
-                                          &body body)
-  #!+sb-doc
-  "Execute BODY with VAR bound to each successive possible expansion for
-   PATHNAME and then return RESULT. Note: if PATHNAME does not contain a
-   search-list, then BODY is executed exactly once. Everything is wrapped
-   in a block named NIL, so RETURN can be used to terminate early. Note:
-   VAR is *not* bound inside of RESULT."
-  (let ((body-name (gensym)))
-    `(block nil
-       (flet ((,body-name (,var)
-               ,@body))
-        (%enumerate-search-list ,pathname #',body-name)
-        ,result))))
-