From: Chris Hanson Date: Fri, 25 May 2001 02:45:51 +0000 (+0000) Subject: Change noun "child", used to refer to something in a container, to X-Git-Tag: 20090517-FFI~2784 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7dd53c420844a51f629a013304c71b5f080d1a00;p=mit-scheme.git Change noun "child", used to refer to something in a container, to "content". --- diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm index ae6042798..bb9fd68c5 100644 --- a/v7/src/imail/imail-core.scm +++ b/v7/src/imail/imail-core.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: imail-core.scm,v 1.136 2001/05/24 17:51:14 cph Exp $ +;;; $Id: imail-core.scm,v 1.137 2001/05/25 02:45:29 cph Exp $ ;;; ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology ;;; @@ -145,26 +145,26 @@ ;; server is Cyrus, this will return "imap://localhost/inbox/". (define-generic container-url-for-prompt (url)) -;; Return the child name of a URL. The child name of a URL is the +;; Return the content name of a URL. The content name of a URL is the ;; suffix of the URL that uniquely identifies the resource with ;; respect to its container. ;; ;; Here are some examples: ;; -;; URL child name -;; --------------------------- ---------- +;; URL content name +;; --------------------------- ------------ ;; imap://localhost/inbox/foo foo ;; imap://localhost/inbox/foo/ foo/ ;; file:/usr/home/cph/foo.mail foo.mail -(define-generic url-child-name (url)) +(define-generic url-content-name (url)) -;; Return a URL that refers to the child CHILD-NAME of the container +;; Return a URL that refers to the content NAME of the container ;; referred to by CONTAINER-URL. -(define-generic make-child-url (container-url child-name)) +(define-generic make-content-url (container-url name)) -;; Return the base name of FOLDER-URL. This is the child name of +;; Return the base name of FOLDER-URL. This is the content name of ;; FOLDER-URL, but presented in a type-independent way. For example, -;; if the child name of a file URL is "foo.mail", the base name is +;; if the content name of a file URL is "foo.mail", the base name is ;; just "foo". (define-generic url-base-name (folder-url)) @@ -215,10 +215,10 @@ (make-string-hash-table)) (define (url-presentation-name url) - (let ((child-name (url-child-name url))) - (if (string-suffix? "/" child-name) - (string-head child-name (fix:- (string-length child-name) 1)) - child-name))) + (let ((name (url-content-name url))) + (if (string-suffix? "/" name) + (string-head name (fix:- (string-length name) 1)) + name))) ;; Do completion on URL-STRING, which is a partially-specified URL. ;; Tail-recursively calls one of the three procedure arguments, as @@ -370,8 +370,8 @@ (define-method container-url-for-prompt ((resource )) (container-url-for-prompt (resource-locator resource))) -(define-method url-child-name ((resource )) - (url-child-name (resource-locator resource))) +(define-method url-content-name ((resource )) + (url-content-name (resource-locator resource))) (define-method url-base-name ((resource )) (url-base-name (resource-locator resource))) @@ -385,8 +385,8 @@ (define-method %append-message (message (folder )) (%append-message message (resource-locator folder))) -(define-method make-child-url ((container ) child-name) - (make-child-url (resource-locator container) child-name)) +(define-method make-content-url ((container ) name) + (make-content-url (resource-locator container) name)) (define-method container-url-contents ((container )) (container-url-contents (resource-locator container))) diff --git a/v7/src/imail/imail-file.scm b/v7/src/imail/imail-file.scm index 70ae63e8a..75a9795a6 100644 --- a/v7/src/imail/imail-file.scm +++ b/v7/src/imail/imail-file.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: imail-file.scm,v 1.72 2001/05/24 17:46:45 cph Exp $ +;;; $Id: imail-file.scm,v 1.73 2001/05/25 02:45:33 cph Exp $ ;;; ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology ;;; @@ -54,7 +54,7 @@ (define-method container-url-for-prompt ((url )) (make-directory-url (pathname-container (pathname-url-pathname url)))) -(define-method url-child-name ((url )) +(define-method url-content-name ((url )) (let ((pathname (pathname-url-pathname url))) (enough-namestring pathname (pathname-container pathname)))) @@ -196,7 +196,7 @@ (define-method url-exists? ((url )) (file-directory? (pathname-url-pathname url))) -(define-method make-child-url ((url ) name) +(define-method make-content-url ((url ) name) (let ((pathname (merge-pathnames name (pathname-url-pathname url)))) ((standard-pathname-url-constructor pathname) pathname))) diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm index 85836110e..cebc0df76 100644 --- a/v7/src/imail/imail-imap.scm +++ b/v7/src/imail/imail-imap.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: imail-imap.scm,v 1.162 2001/05/24 19:12:41 cph Exp $ +;;; $Id: imail-imap.scm,v 1.163 2001/05/25 02:45:41 cph Exp $ ;;; ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology ;;; @@ -170,15 +170,15 @@ (get-personal-namespace url) ""))) -(define-method url-child-name ((url )) +(define-method url-content-name ((url )) (let* ((mailbox (imap-url-mailbox url)) (index (imap-mailbox-container-slash mailbox))) (if index (string-tail mailbox (fix:+ index 1)) mailbox))) -(define-method make-child-url ((url ) child-name) - (imap-url-new-mailbox url (string-append (imap-url-mailbox url) child-name))) +(define-method make-content-url ((url ) name) + (imap-url-new-mailbox url (string-append (imap-url-mailbox url) name))) (define (imap-url-container-mailbox url) (let* ((mailbox (imap-url-mailbox url)) diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm index 66778d06d..271cec45c 100644 --- a/v7/src/imail/imail-top.scm +++ b/v7/src/imail/imail-top.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Id: imail-top.scm,v 1.250 2001/05/24 17:46:51 cph Exp $ +;;; $Id: imail-top.scm,v 1.251 2001/05/25 02:45:51 cph Exp $ ;;; ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology ;;; @@ -1375,7 +1375,7 @@ If it doesn't exist, it is created first." (list from (prompt-for-folder "Copy messages to folder" - (make-child-url + (make-content-url (or (let ((history (prompt-history-strings 'IMAIL-COPY-FOLDER-TARGET))) (and (pair? history)