From 792798f48647ef664cfe6fdd7ff313901e383f6c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2015 22:26:18 +0200 Subject: records: "options" → "properties". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/records.scm (define-record-type*): Change "options" to "properties". --- guix/records.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index dbdd2201a6..816e9f6f01 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -196,8 +196,8 @@ (define (field-default-value s) (syntax-case s (default) ((field (default val) _ ...) (list #'field #'val)) - ((field _ options ...) - (field-default-value #'(field options ...))) + ((field _ properties ...) + (field-default-value #'(field properties ...))) (_ #f))) (define-field-property-predicate delayed-field? delayed) @@ -210,7 +210,7 @@ (define (wrapped-field-accessor-name field) ;; Return the name (an unhygienic syntax object) of the "real" ;; getter for field, which is assumed to be a wrapped field. (syntax-case field () - ((field get options ...) + ((field get properties ...) (let* ((getter (syntax->datum #'get)) (real-getter (symbol-append '% getter '-real))) (datum->syntax #'get real-getter))))) @@ -219,7 +219,7 @@ (define (field-spec->srfi-9 field) ;; Convert a field spec of our style to a SRFI-9 field spec of the ;; form (field get). (syntax-case field () - ((name get options ...) + ((name get properties ...) #`(name #,(if (wrapped-field? field) (wrapped-field-accessor-name field) @@ -247,12 +247,12 @@ (define (delayed-field-accessor-definition field) (syntax-case s () ((_ type syntactic-ctor ctor pred - (field get options ...) ...) - (let* ((field-spec #'((field get options ...) ...)) + (field get properties ...) ...) + (let* ((field-spec #'((field get properties ...) ...)) (thunked (filter-map thunked-field? field-spec)) (delayed (filter-map delayed-field? field-spec)) (defaults (filter-map field-default-value - #'((field options ...) ...)))) + #'((field properties ...) ...)))) (with-syntax (((field-spec* ...) (map field-spec->srfi-9 field-spec)) ((thunked-field-accessor ...) -- cgit v1.2.3