X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=07e9a4e6a220ac3c9ce409e87d4af9aa4e4f0a3c;hb=bf27595fb567015495b7131707cc85af361567fe;hp=67b442ac7a5a535698550db714b688f36ad74a1b;hpb=7ef5ec93744c7cc1c7a0280e46f8b42b74353713;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 67b442a..07e9a4e 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -17,26 +17,29 @@
 ;;; pathname information into structure slot entries, and after
 ;;; translation the inverse (unparse) functions.
 (def!struct (host (:constructor nil))
-  (parse (required-argument) :type function)
-  (unparse (required-argument) :type function)
-  (unparse-host (required-argument) :type function)
-  (unparse-directory (required-argument) :type function)
-  (unparse-file (required-argument) :type function)
-  (unparse-enough (required-argument) :type function)
-  (customary-case (required-argument) :type (member :upper :lower)))
+  (parse (missing-arg) :type function)
+  (unparse (missing-arg) :type function)
+  (unparse-host (missing-arg) :type function)
+  (unparse-directory (missing-arg) :type function)
+  (unparse-file (missing-arg) :type function)
+  (unparse-enough (missing-arg) :type function)
+  (customary-case (missing-arg) :type (member :upper :lower)))
+
+(def!method print-object ((host host) stream)
+  (print-unreadable-object (host stream :type t :identity t)))
 
 (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-logical-file)
+		       (unparse-enough #'unparse-enough-namestring)
+		       (customary-case :upper)))
   (name "" :type simple-base-string)
   (translations nil :type list)
   (canon-transls nil :type list))
@@ -45,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))
 
 ;;;; 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
@@ -85,12 +87,6 @@
   ;; 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 ::=
@@ -108,7 +104,7 @@
 ;;; Physical pathnames include all these slots and a device slot.
 
 ;;; Logical pathnames are a subclass of PATHNAME. Their class
-;;; relations are mimicked using structures for efficency.
+;;; relations are mimicked using structures for efficiency.
 (sb!xc:defstruct (logical-pathname (:conc-name %logical-pathname-)
 				   (:include pathname)
 				   (:constructor %make-logical-pathname