From 8fd5bd2b69b51e370144f26c01201a178c024483 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 1 Jul 2012 17:32:03 +0200 Subject: define-record-type*: Add `letrec*' behavior. * guix/utils.scm (define-record-type*)[make-syntactic-constructor]: Bind all the ((FIELD VALUE) ...) in a `letrec*'. Adjust `field-value' accordingly. * tests/utils.scm ("define-record-type* with letrec* behavior"): New test. --- guix/utils.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'guix') diff --git a/guix/utils.scm b/guix/utils.scm index ed13bae307..3d92bac9cc 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -479,20 +479,18 @@ (define (make-syntactic-constructor name ctor fields defaults) (lambda (s) (syntax-case s expected ((_ (field value) (... ...)) - (let ((fields (map syntax->datum #'(field (... ...)))) - (inits (map (match-lambda - ((f v) - (list (syntax->datum f) v))) - #'((field value) (... ...)))) - (dflt (map (match-lambda - ((f v) - (list (syntax->datum f) v))) - #'defaults))) - - (define (field-value f) - (match (assoc f inits) - ((_ v) v) - (#f (car (assoc-ref dflt f))))) + (let ((fields (map syntax->datum #'(field (... ...)))) + (dflt (map (match-lambda + ((f v) + (list (syntax->datum f) v))) + #'defaults))) + + (define (field-value f) + (or (and=> (find (lambda (x) + (eq? f (car (syntax->datum x)))) + #'((field value) (... ...))) + car) + (car (assoc-ref dflt (syntax->datum f))))) (let-syntax ((error* (syntax-rules () @@ -503,7 +501,8 @@ (define (field-value f) s))))) (let ((fields (append fields (map car dflt)))) (cond ((lset= eq? fields 'expected) - #`(ctor #,@(map field-value 'expected))) + #`(letrec* ((field value) (... ...)) + (ctor #,@(map field-value 'expected)))) ((pair? (lset-difference eq? fields 'expected)) (error* "extraneous field initializers ~a" (lset-difference eq? fields 'expected))) -- cgit v1.2.3