amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

records: Improve reporting of "invalid field specifier" errors.

Browse source 
Previously users would just see:

  error: invalid field specifier

without source location or hints.

* guix/records.scm (expand): Add optional 'parent-form' parameter and
pass it to 'syntax-violation' when it is true.
(make-syntactic-constructor): Pass S as a third argument to
'report-invalid-field-specifier'.
* guix/ui.scm (report-load-error): For 'syntax-error', show SUBFORM or
FORM in the message.
* tests/records.scm ("define-record-type* & wrong field specifier"): Add
a 'subform' parameter and adjust test accordingly.
("define-record-type* & wrong field specifier, identifier"): New test.
* tests/guix-system.sh: Add test.
This commit is contained in:
Ludovic Courtès 2020-01-16 15:00:18 +01:00
parent 84c5da08dd
commit 47212fc763
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 69 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/records.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -286,10 +286,11 @@
(lambda ()
(eval exp (test-module))
#f)
(lambda (key proc message location form . args)
(lambda (key proc message location form subform . _)
(and (eq? proc 'foo)
(string-match "invalid field" message)
(equal? form '(baz 1 2 3 4 5))
(equal? subform '(baz 1 2 3 4 5))
(equal? form '(foo (baz 1 2 3 4 5)))
;; Make sure the location is that of the field specifier.
;; See <http://bugs.gnu.org/23969>.
@ -299,6 +300,33 @@
,@(alist-delete 'line loc)))
(pk 'actual-loc location)))))))
(test-assert "define-record-type* & wrong field specifier, identifier"
(let ((exp '(begin
(define-record-type* <foo> foo make-foo
foo?
(bar foo-bar (default 42))
(baz foo-baz))
(foo
baz))) ;syntax error
(loc (current-source-location))) ;keep this alignment!
(catch 'syntax-error
(lambda ()
(eval exp (test-module))
#f)
(lambda (key proc message location form subform . _)
(and (eq? proc 'foo)
(string-match "invalid field" message)
(equal? subform 'baz)
(equal? form '(foo baz))
;; Here the location is that of the parent form.
(lset= equal?
(pk 'expected-loc
`((line . ,(- (assq-ref loc 'line) 2))
,@(alist-delete 'line loc)))
(pk 'actual-loc location)))))))
(test-assert "define-record-type* & missing initializers"
(catch 'syntax-error
(lambda ()