From 2eebd1113a40fc6e7018975d3696546de584e4a0 Mon Sep 17 00:00:00 2001 Message-Id: <2eebd1113a40fc6e7018975d3696546de584e4a0.1637548566.git.julien@lepiller.eu> In-Reply-To: References: From: Julien Lepiller Date: Sun, 31 Oct 2021 02:58:14 +0100 Subject: [PATCH 2/2] guix: records: Improve error reporting. * guix/records.scm (report-invalid-field-specifier): Handle various invalidity causes separately. --- guix/records.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index ed94c83dac..eeb5908844 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +22,13 @@ (define-module (guix records) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-35) + #:use-module (ice-9 exceptions) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) + #:use-module (guix diagnostics) + #:use-module (guix ui) #:autoload (system base target) (target-most-positive-fixnum) #:export (define-record-type* this-record @@ -83,10 +88,53 @@ (define-syntax record-error ;; WEIRD may be an identifier, thus lacking source location info, and ;; BINDINGS is a list, also lacking source location info. Hopefully ;; PARENT-FORM provides source location info. - (apply syntax-violation name "invalid field specifier" - (if parent-form - (list parent-form #'weird) - (list #'weird))))))) + (let* ((weird-properties (source-properties #'weird)) + (parent-properties (and parent-form (syntax-source parent-form))) + (form parent-form) + (location (source-properties->location + (or (and (not (null? weird-properties)) weird-properties) + (and (not (null? parent-properties)) parent-properties) + '())))) + (syntax-case #'weird () + (() ;the empty list + (raise-exception + (condition + (&message (message (G_ "invalid field specifier."))) + (&syntax (form form) (subform (syntax->datum #'weird))) + (&error-location (location location)) + (&fix-hint (hint (G_ "The format of a field is `(field value)'")))))) + (((field ...) _ ...) ;a list whose first element is a list + (raise-exception + (condition + (&message (message (G_ "invalid field name."))) + (&syntax (form form) (subform (map syntax->datum #'(field ...)))) + (&error-location (location location))))) + ((field) ;a list with one element + (raise-exception + (condition + (&message (message (G_ "missing value in field specifier."))) + (&syntax (form form) (subform (syntax->datum #'weird))) + (&error-location (location location)) + (&fix-hint (hint (format #f (G_ "The field is missing a value: `(~a )'.") + (syntax->datum #'field))))))) + ((field value ...) ;any other list + (raise-exception + (condition + (&message (message (G_ "multiple values in field specifier."))) + (&syntax (form form) (subform (syntax->datum #'weird))) + (&error-location (location location)) + (&fix-hint (hint (format #f (G_ "~a values were associated with \ +field `~a'. Perhaps the additional values were intended to be other field \ +specifiers. This usually indicates missing or misplaced parenthesis.") + (length #'(value ...)) + (syntax->datum #'field))))))) + (field ;not a list + (raise-exception + (condition + (&message (message (G_ "invalid field specifier."))) + (&syntax (form form) (subform (syntax->datum #'weird))) + (&error-location (location location)) + (&fix-hint (hint (G_ "The format of a field is `(field value)'")))))))))))) (define (report-duplicate-field-specifier name ctor) "Report the first duplicate identifier among the bindings in CTOR." -- 2.33.1