0.8.0.24:

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

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 644dbf1..61195bd 100644 (file)
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -31,15 +31,15 @@
 (def!struct (logical-host
             (:make-load-form-fun make-logical-host-load-form-fun)
             (:include host
-                      (:parse #'parse-logical-namestring)
-                      (:unparse #'unparse-logical-namestring)
-                      (:unparse-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)))
+                      (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))
@@ -48,23 +48,22 @@
   (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))
+  (values `(find-logical-host ',(logical-host-name logical-host))
+         nil))
 
 ;;; A PATTERN is a list of entries and wildcards used for pattern
 ;;; matches of translations.
-(sb!xc:defstruct (pattern (:constructor make-pattern (pieces)))
+(def!struct (pattern (:constructor make-pattern (pieces)))
   (pieces nil :type list))
 \f
 ;;;; PATHNAME structures
 
 ;;; the various magic tokens that are allowed to appear in pretty much
 ;;; all pathname components
-(sb!xc:deftype pathname-component-tokens ()
-  '(member nil :unspecific :wild))
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
+  (def!type pathname-component-tokens ()
+    '(member nil :unspecific :wild)))
 
 (sb!xc:defstruct (pathname (:conc-name %pathname-)
                           (:constructor %make-pathname (host