X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=07e9a4e6a220ac3c9ce409e87d4af9aa4e4f0a3c;hb=b2ad48f269cd6b9403820588d65eac526e4e32fd;hp=6815d1d9e295436b0059d1bc1c5f9691e1af604a;hpb=a8f2656f635d81ec326303f47e0612fb1f35fd91;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 6815d1d..07e9a4e 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -16,41 +16,54 @@
 ;;; The HOST structure holds the functions that both parse the
 ;;; pathname information into structure slot entries, and after
 ;;; translation the inverse (unparse) functions.
-(sb!xc:defstruct (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)))
+(def!struct (host (:constructor nil))
+  (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)))
 
-(sb!xc:defstruct (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)))
+(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-logical-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)))
+
+(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 component-tokens () ; FIXME: rename to 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
@@ -63,16 +76,16 @@
   ;; 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
-  (device nil :type (or simple-string component-tokens))
+  (device nil :type (or simple-string pathname-component-tokens))
   ;; a list of strings that are the component subdirectory components
   (directory nil :type list)
   ;; the filename
-  (name nil :type (or simple-string pattern component-tokens))
+  (name nil :type (or simple-string pattern pathname-component-tokens))
   ;; the type extension of the file
-  (type nil :type (or simple-string pattern component-tokens))
+  (type nil :type (or simple-string pattern pathname-component-tokens))
   ;; the version number of the file, a positive integer (not supported
   ;; on standard Unix filesystems)
-  (version nil :type (or integer component-tokens (member :newest))))
+  (version nil :type (or integer pathname-component-tokens (member :newest))))
 
 ;;; Logical pathnames have the following format:
 ;;;
@@ -90,8 +103,8 @@
 ;;;
 ;;; 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
@@ -101,19 +114,3 @@
 						  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))))
-