X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=2fa8fa069fc2ca2c043104710b0655ea0d990c7a;hb=71d60093b1a9d80c4de6c5f51c6783eef86968d9;hp=4df7de6cffe96ae53fd03b58995d166af2c9d2ba;hpb=78a057624fecd10d0fb2ead4ef02ffc361b1ee22;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 4df7de6..2fa8fa0 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -18,28 +18,40 @@
 ;;; translation the inverse (unparse) functions.
 (def!struct (host (:constructor nil))
   (parse (missing-arg) :type function)
+  (parse-native (missing-arg) :type function)
   (unparse (missing-arg) :type function)
+  (unparse-native (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)
+  (unparse-directory-separator (missing-arg) :type simple-string)
   (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
-			(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)
+                       (parse-native
+                        (lambda (x)
+                          (error "called PARSE-NATIVE-NAMESTRING using a ~
+                                  logical host: ~S" x)))
+                       (unparse #'unparse-logical-namestring)
+                       (unparse-native
+                        (lambda (x)
+                          (error "called NATIVE-NAMESTRING using a ~
+                                  logical host: ~S" x)))
+                       (unparse-host
+                        (lambda (x)
+                          (logical-host-name (%pathname-host x))))
+                       (unparse-directory #'unparse-logical-directory)
+                       (unparse-file #'unparse-logical-file)
+                       (unparse-enough #'unparse-enough-namestring)
+                       (unparse-directory-separator ";")
+                       (customary-case :upper)))
   (name "" :type simple-base-string)
   (translations nil :type list)
   (canon-transls nil :type list))
@@ -48,32 +60,31 @@
   (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
-							 device
-							 directory
-							 name
-							 type
-							 version))
-			   (:predicate pathnamep))
+                           (:constructor %make-pathname (host
+                                                         device
+                                                         directory
+                                                         name
+                                                         type
+                                                         version))
+                           (:predicate pathnamep))
   ;; the host (at present either a UNIX or logical host)
   (host nil :type (or host null))
   ;; the name of a logical or physical device holding files
@@ -91,7 +102,7 @@
 ;;; Logical pathnames have the following format:
 ;;;
 ;;; logical-namestring ::=
-;;;	 [host ":"] [";"] {directory ";"}* [name] ["." type ["." version]]
+;;;      [host ":"] [";"] {directory ";"}* [name] ["." type ["." version]]
 ;;;
 ;;; host ::= word
 ;;; directory ::= word | wildcard-word | **
@@ -107,11 +118,11 @@
 ;;; Logical pathnames are a subclass of PATHNAME. Their class
 ;;; relations are mimicked using structures for efficiency.
 (sb!xc:defstruct (logical-pathname (:conc-name %logical-pathname-)
-				   (:include pathname)
-				   (:constructor %make-logical-pathname
-						 (host
-						  device
-						  directory
-						  name
-						  type
-						  version))))
+                                   (:include pathname)
+                                   (:constructor %make-logical-pathname
+                                                 (host
+                                                  device
+                                                  directory
+                                                  name
+                                                  type
+                                                  version))))