Browse Source

records: Report unknown field names in inheriting forms.

* guix/records.scm (define-record-type*)[record-inheritance]: Check for
  unexpected field names.
* tests/records.scm ("define-record-type* with let* behavior"): Return
  #t, not *unspecified*.
  ("define-record-type* & inherit & extra initializers"): New test.
gn-latest-20200428
Ludovic Courtès 6 years ago
parent
commit
a1906758c3
2 changed files with 24 additions and 1 deletions
  1. +8
    -0
      guix/records.scm
  2. +16
    -1
      tests/records.scm

+ 8
- 0
guix/records.scm View File

@@ -69,6 +69,14 @@ thunked fields."
field+value)
car))

;; Make sure there are no unknown field names.
(let* ((fields (map (compose car syntax->datum)
field+value))
(unexpected (lset-difference eq? fields 'expected)))
(when (pair? unexpected)
(record-error 'name s "extraneous field initializers ~a"
unexpected)))

#`(make-struct type 0
#,@(map (lambda (field index)
(or (field-inherited-value field)


+ 16
- 1
tests/records.scm View File

@@ -58,7 +58,7 @@
(match (bar (x 7) (z (* x 3)))
(($ <bar> 7 42 21)))
(match (bar (z 21) (x (/ z 3)))
(($ <bar> 7 42 21))))))
(($ <bar> 7 42 21) #t)))))

(test-assert "define-record-type* & inherit"
(begin
@@ -171,6 +171,21 @@
(and (string-match "extra.*initializer.*baz" message)
(eq? proc 'foo)))))

(test-assert "define-record-type* & inherit & extra initializers"
(catch 'syntax-error
(lambda ()
(eval '(begin
(define-record-type* <foo> foo make-foo
foo?
(bar foo-bar (default 42)))

(foo (inherit (foo)) (baz 'what?)))
(test-module))
#f)
(lambda (key proc message location form . args)
(and (string-match "extra.*initializer.*baz" message)
(eq? proc 'foo)))))

(test-equal "recutils->alist"
'((("Name" . "foo")
("Version" . "0.1")


Loading…
Cancel
Save