aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-11 22:26:18 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-11 23:33:32 +0200
commit792798f48647ef664cfe6fdd7ff313901e383f6c (patch)
tree9bbf5cbbb89aecbda2265ac8e95145f07153fc77
parentfaef3b6a96114524c2a25e3b84caa042a2d2e598 (diff)
downloadguix-792798f48647ef664cfe6fdd7ff313901e383f6c.tar
guix-792798f48647ef664cfe6fdd7ff313901e383f6c.tar.gz
records: "options" → "properties".
* guix/records.scm (define-record-type*): Change "options" to "properties".
-rw-r--r--guix/records.scm14
1 files 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 @@ field."
(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 @@ 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 @@ 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 @@ 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 ...)