records: Factorize field property predicates.

* guix/records.scm (define-field-property-predicate): New macro.
  (define-record-type*)[thunked-field?, delayed-field?]: Use it.
This commit is contained in:
Ludovic Courtès 2015-06-11 22:22:05 +02:00
parent b9c8647337
commit faef3b6a96

View file

@ -142,6 +142,17 @@ (define (field-value f)
'(expected ...)
fields)))))))))))))
(define-syntax-rule (define-field-property-predicate predicate property)
"Define PREDICATE as a procedure that takes a syntax object and, when passed
a field specification, returns the field name if it has the given PROPERTY."
(define (predicate s)
(syntax-case s (property)
((field (property values (... ...)) _ (... ...))
#'field)
((field _ properties (... ...))
(predicate #'(field properties (... ...))))
(_ #f))))
(define-syntax define-record-type*
(lambda (s)
"Define the given record type such that an additional \"syntactic
@ -189,23 +200,8 @@ (define (field-default-value s)
(field-default-value #'(field options ...)))
(_ #f)))
(define (delayed-field? s)
;; Return the field name if the field defined by S is delayed.
(syntax-case s (delayed)
((field (delayed) _ ...)
#'field)
((field _ options ...)
(delayed-field? #'(field options ...)))
(_ #f)))
(define (thunked-field? s)
;; Return the field name if the field defined by S is thunked.
(syntax-case s (thunked)
((field (thunked) _ ...)
#'field)
((field _ options ...)
(thunked-field? #'(field options ...)))
(_ #f)))
(define-field-property-predicate delayed-field? delayed)
(define-field-property-predicate thunked-field? thunked)
(define (wrapped-field? s)
(or (thunked-field? s) (delayed-field? s)))