X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpathname.lisp;h=644dbf1b33551ebfc51228b517cd2414ea3980a5;hb=45e102d04c2fd1be31ccb9f63d123ea86afb1858;hp=1b221ff2477abf942bde2f34fe796281f847e3ac;hpb=4f9d842fc0a23394dbf5fc5b1916fe98a3ac7cbe;p=sbcl.git diff --git a/src/code/pathname.lisp b/src/code/pathname.lisp index 1b221ff..644dbf1 100644 --- a/src/code/pathname.lisp +++ b/src/code/pathname.lisp @@ -17,13 +17,16 @@ ;;; 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) @@ -85,12 +88,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 ::= @@ -108,7 +105,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 @@ -118,19 +115,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)))) -