X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=da7e13723d2f075c92f16012818b95cc0b29389a;hb=25e76ec2b1083ac6a4bba42af7ad7b5a8239f2b8;hp=c24892f04c78ccb1609031c035e6901215f1d464;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp index c24892f..da7e137 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-unix-file) + (unparse-enough #'unparse-enough-namestring) + (customary-case :upper))) (name "" :type simple-base-string) (translations nil :type list) (canon-transls nil :type list)) @@ -45,11 +48,9 @@ (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 "~@" - 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. @@ -85,12 +86,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 ::=