diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-07-17 16:45:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-17 16:45:45 +0200 |
| commit | a1906758c31036c30f8c11703daa4202adde8dac (patch) | |
| tree | 6f883bda37ee9e445792e7938b211c87af6f88f5 | |
| parent | b1353e7a6baf15e6e1db79063c01f4b07b6d4e06 (diff) | |
| download | guix-a1906758c31036c30f8c11703daa4202adde8dac.tar.gz | |
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.
| -rw-r--r-- | guix/records.scm | 8 | ||||
| -rw-r--r-- | tests/records.scm | 17 |
2 files changed, 24 insertions, 1 deletions
diff --git a/guix/records.scm b/guix/records.scm index e60732dd43..cd887b77ce 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -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) diff --git a/tests/records.scm b/tests/records.scm index 23c0786e9e..e90d33d15d 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -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") |