X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=da7e13723d2f075c92f16012818b95cc0b29389a;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=249872345186c974edcfe4266864cf504145eb7c;hpb=1c347eae5ec81b6f41db9d27c1fe6d34abe1d3ca;p=sbcl.git

diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp
index 2498723..da7e137 100644
--- a/src/code/pathname.lisp
+++ b/src/code/pathname.lisp
@@ -17,25 +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-unix-file)
+		       (unparse-enough #'unparse-enough-namestring)
+		       (customary-case :upper)))
   (name "" :type simple-base-string)
   (translations nil :type list)
   (canon-transls nil :type list))
@@ -44,6 +48,10 @@
   (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)))
@@ -95,7 +103,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
@@ -105,19 +113,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))))
-