X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=542aa094c93018cfb734120b40c98f006f246ad5;hb=ba871531b6b394da295c9a4527346e1e6327ccca;hp=7b44faeeadcf45c6112385540a4091251ace9039;hpb=0b3ec4b1d978b887db175b7b3bada8e727683e15;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 7b44fae..542aa09 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -17,49 +17,76 @@
 ;;; 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)
+  (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)
+  (simplify-namestring (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
-		  (: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)
+             (: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 ";")
+                       (simplify-namestring #'identity)
+                       (customary-case :upper)))
+  (name "" :type simple-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)))
+
+(defun make-logical-host-load-form-fun (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
@@ -77,7 +104,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 | **
@@ -90,30 +117,14 @@
 ;;;
 ;;; 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.
+;;; 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))))
-
-(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))))
-
+                                   (:include pathname)
+                                   (:constructor %make-logical-pathname
+                                                 (host
+                                                  device
+                                                  directory
+                                                  name
+                                                  type
+                                                  version))))