[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: records: "options" → "properties".
From: |
Ludovic Courtès |
Subject: |
04/10: records: "options" → "properties". |
Date: |
Thu, 11 Jun 2015 21:33:41 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 792798f48647ef664cfe6fdd7ff313901e383f6c
Author: Ludovic Courtès <address@hidden>
Date: Thu Jun 11 22:26:18 2015 +0200
records: "options" → "properties".
* guix/records.scm (define-record-type*): Change "options" to "properties".
---
guix/records.scm | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/guix/records.scm b/guix/records.scm
index dbdd220..816e9f6 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 ...)
- branch master updated (b45ce07 -> 6c35641), Ludovic Courtès, 2015/06/11
- 02/10: records: Separate default-value handling., Ludovic Courtès, 2015/06/11
- 04/10: records: "options" → "properties".,
Ludovic Courtès <=
- 03/10: records: Factorize field property predicates., Ludovic Courtès, 2015/06/11
- 01/10: records: Replace 'eval-when' with a proper 'define-syntax'., Ludovic Courtès, 2015/06/11
- 05/10: records: Add support for 'innate' fields., Ludovic Courtès, 2015/06/11
- 07/10: gnu: guix: Update snapshot., Ludovic Courtès, 2015/06/11
- 06/10: packages: Make 'location' field innate., Ludovic Courtès, 2015/06/11
- 08/10: tests: Write the random seed to the error port., Ludovic Courtès, 2015/06/11
- 10/10: tests: Avoid sequence of zero expressions., Ludovic Courtès, 2015/06/11
- 09/10: records: Remove unnecessary 'begin'., Ludovic Courtès, 2015/06/11