summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-24 20:48:14 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-24 20:48:14 +0100
commitbbb2bd50dcb160d8e60fc657b96f1b6739cd8d89 (patch)
treeb58e371efb8120b91a15822434b4d6f53200cc74 /guix
parent2c5ee9bba4067fb0a9e68fb2af3a6e7fe36960cb (diff)
records: Make 'report-duplicate-field-specifier' available at expansion-time.
Fixes a regression in 'guix pack -R' introduced with commit c2dcff41c2e47f5f978f467864d5ed7829939884. The imported modules of 'c-compiler' would be compiled in this order: first (guix records), then (guix search-paths). Consequently, 'report-duplicate-field-specifier' would be reported as unbound while compiling (guix search-paths), leading to a build failure. * guix/records.scm (report-invalid-field-specifier) (report-duplicate-field-specifier): Move within 'eval-expand'.
Diffstat (limited to 'guix')
-rw-r--r--guix/records.scm54
1 files changed, 27 insertions, 27 deletions
diff --git a/guix/records.scm b/guix/records.scm
index 6b3c25cefa..0649c90ea3 100644
--- a/guix/records.scm
+++ b/guix/records.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@@ -44,31 +44,6 @@
(format #f fmt args ...)
form))))
-(define (report-invalid-field-specifier name bindings)
- "Report the first invalid binding among BINDINGS."
- (let loop ((bindings bindings))
- (syntax-case bindings ()
- (((field value) rest ...) ;good
- (loop #'(rest ...)))
- ((weird _ ...) ;weird!
- (syntax-violation name "invalid field specifier" #'weird)))))
-
-(define (report-duplicate-field-specifier name ctor)
- "Report the first duplicate identifier among the bindings in CTOR."
- (syntax-case ctor ()
- ((_ bindings ...)
- (let loop ((bindings #'(bindings ...))
- (seen '()))
- (syntax-case bindings ()
- (((field value) rest ...)
- (not (memq (syntax->datum #'field) seen))
- (loop #'(rest ...) (cons (syntax->datum #'field) seen)))
- ((duplicate rest ...)
- (syntax-violation name "duplicate field initializer"
- #'duplicate))
- (()
- #t))))))
-
(eval-when (expand load eval)
;; The procedures below are needed both at run time and at expansion time.
@@ -91,7 +66,32 @@ interface\" (ABI) for TYPE is equal to COOKIE."
;; recompiled.
(throw 'record-abi-mismatch-error 'abi-check
"~a: record ABI mismatch; recompilation needed"
- (list #,type) '())))))
+ (list #,type) '()))))
+
+ (define (report-invalid-field-specifier name bindings)
+ "Report the first invalid binding among BINDINGS."
+ (let loop ((bindings bindings))
+ (syntax-case bindings ()
+ (((field value) rest ...) ;good
+ (loop #'(rest ...)))
+ ((weird _ ...) ;weird!
+ (syntax-violation name "invalid field specifier" #'weird)))))
+
+ (define (report-duplicate-field-specifier name ctor)
+ "Report the first duplicate identifier among the bindings in CTOR."
+ (syntax-case ctor ()
+ ((_ bindings ...)
+ (let loop ((bindings #'(bindings ...))
+ (seen '()))
+ (syntax-case bindings ()
+ (((field value) rest ...)
+ (not (memq (syntax->datum #'field) seen))
+ (loop #'(rest ...) (cons (syntax->datum #'field) seen)))
+ ((duplicate rest ...)
+ (syntax-violation name "duplicate field initializer"
+ #'duplicate))
+ (()
+ #t)))))))
(define-syntax make-syntactic-constructor
(syntax-rules ()