From 1f38ff4c8b93cde533cf3d3f67358aafe9cf3dfa Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 24 Aug 2021 17:32:33 +0200 Subject: [PATCH] guix: records: let*-bind raw values, wrap them in constructor. This fixes the abstraction leakage mentioned in . * guix/records.scm (make-syntactic-constructor)[field-bindings]: Bind to raw value. [field-value]: Always wrap the value. [record-inheritance]: Wrap "inherited" values. --- guix/records.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index ed94c83dac..074f1650c8 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -153,7 +153,10 @@ of TYPE matches the expansion-time ABI." #`(make-struct/no-tail type #,@(map (lambda (field index) - (or (field-inherited-value field) + (or (and=> + (field-inherited-value field) + (lambda (value) + (wrap-field-value field value))) (if (innate-field? field) (wrap-field-value field (field-default-value field)) @@ -211,8 +214,7 @@ of TYPE matches the expansion-time ABI." (map (lambda (field+value) (syntax-case field+value () ((field value) - #`(field - #,(wrap-field-value #'field #'value))))) + #`(field value)))) field+value)) (syntax-case s (inherit expected ...) @@ -224,10 +226,11 @@ of TYPE matches the expansion-time ABI." ((_ (field value) (... ...)) (let ((fields (map syntax->datum #'(field (... ...))))) (define (field-value f) - (or (find (lambda (x) - (eq? f (syntax->datum x))) - #'(field (... ...))) - (wrap-field-value f (field-default-value f)))) + (wrap-field-value f + (or (find (lambda (x) + (eq? f (syntax->datum x))) + #'(field (... ...))) + (field-default-value f)))) ;; Pass S to make sure source location info is preserved. (report-duplicate-field-specifier 'name s) -- 2.33.0