mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 17:20:29 +02:00
Code Activity

Improve error messages for invalid record definitions.

Browse source 
* module/srfi/srfi-9.scm (%define-record-type): Accept additional 'form'
  parameter which contains the original form of 'define-record-type' or
  'define-immutable-record-type'.  Add elaborate pattern guard which
  raises descriptive syntax errors for specific errors, and a fallback
  pattern to catch anything else.
  (define-record-type): Pass 'form' parameter to %define-record-type.

* module/srfi/srfi-9/gnu.scm (define-immutable-record-type): Pass 'form'
  parameter to %define-record-type.

* test-suite/tests/srfi-9.test: Add tests.
This commit is contained in:
Mark H Weaver 2012-11-09 03:22:40 -05:00
parent dfba1025e5
commit f31a076232
3 changed files with 146 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

44
module/srfi/srfi-9.scm
View file

@ -205,8 +205,10 @@
(let ((name (syntax->datum field))) (let ((name (syntax->datum field)))
(or (memq name field-names) (or (memq name field-names)
(syntax-violation (syntax-violation
'define-record-type (syntax-case form ()
"unknown field in constructor-spec" ((macro . args)
(syntax->datum #'macro)))
"unknown field in constructor spec"
form field)) form field))
(cons name field))) (cons name field)))
#'(field ...)))) #'(field ...))))
@ -262,9 +264,30 @@
(string-concatenate (make-list count desc)))) (string-concatenate (make-list count desc))))
(syntax-case x () (syntax-case x ()
((_ immutable? type-name constructor-spec predicate-name ((_ immutable? form type-name constructor-spec predicate-name
field-spec ...) field-spec ...)
(boolean? (syntax->datum #'immutable?)) (let ()
(define (syntax-error message subform)
(syntax-violation (syntax-case #'form ()
((macro . args) (syntax->datum #'macro)))
message #'form subform))
(and (boolean? (syntax->datum #'immutable?))
(or (identifier? #'type-name)
(syntax-error "expected type name" #'type-name))
(syntax-case #'constructor-spec ()
((ctor args ...)
(every identifier? #'(ctor args ...))
#t)
(_ (syntax-error "invalid constructor spec"
#'constructor-spec)))
(or (identifier? #'predicate-name)
(syntax-error "expected predicate name" #'predicate-name))
(every (lambda (spec)
(syntax-case spec ()
((field getter) #t)
((field getter setter) #t)
(_ (syntax-error "invalid field spec" spec))))
#'(field-spec ...))))
(let* ((field-ids (field-identifiers #'(field-spec ...))) (let* ((field-ids (field-identifiers #'(field-spec ...)))
(getter-ids (getter-identifiers #'(field-spec ...))) (getter-ids (getter-identifiers #'(field-spec ...)))
(field-count (length field-ids)) (field-count (length field-ids))
@ -275,7 +298,7 @@
((ctor args ...) #'ctor))) ((ctor args ...) #'ctor)))
(copier-id (make-copier-id #'type-name))) (copier-id (make-copier-id #'type-name)))
#`(begin #`(begin
#,(constructor x #'type-name #'constructor-spec field-names) #,(constructor #'form #'type-name #'constructor-spec field-names)
(define type-name (define type-name
(let ((rtd (make-struct/no-tail (let ((rtd (make-struct/no-tail
@ -296,9 +319,16 @@
#,(copier #'type-name getter-ids copier-id) #,(copier #'type-name getter-ids copier-id)
#,@(if immutable? #,@(if immutable?
(functional-setters copier-id #'(field-spec ...)) (functional-setters copier-id #'(field-spec ...))
(setters #'type-name #'(field-spec ...))))))))) (setters #'type-name #'(field-spec ...))))))
((_ immutable? form . rest)
(syntax-violation
(syntax-case #'form ()
((macro . args) (syntax->datum #'macro)))
"invalid record definition syntax"
#'form)))))
(define-syntax-rule (define-record-type name ctor pred fields ...) (define-syntax-rule (define-record-type name ctor pred fields ...)
(%define-record-type #f name ctor pred fields ...)) (%define-record-type #f (define-record-type name ctor pred fields ...)
name ctor pred fields ...))
;;; srfi-9.scm ends here ;;; srfi-9.scm ends here

4
module/srfi/srfi-9/gnu.scm
View file

@ -34,7 +34,9 @@
(struct-set! type vtable-index-printer thunk)) (struct-set! type vtable-index-printer thunk))
(define-syntax-rule (define-immutable-record-type name ctor pred fields ...) (define-syntax-rule (define-immutable-record-type name ctor pred fields ...)
((@@ (srfi srfi-9) %define-record-type) #t name ctor pred fields ...)) ((@@ (srfi srfi-9) %define-record-type)
#t (define-immutable-record-type name ctor pred fields ...)
name ctor pred fields ...))
(define-syntax-rule (set-field (getter ...) s expr) (define-syntax-rule (set-field (getter ...) s expr)
(%set-fields #t (set-field (getter ...) s expr) () (%set-fields #t (set-field (getter ...) s expr) ()

106
test-suite/tests/srfi-9.test
View file

@ -610,6 +610,112 @@
(lambda (key whom what src form subform) (lambda (key whom what src form subform)
(list key whom what form subform)))))) (list key whom what form subform))))))
(with-test-prefix "record type definition error reporting"
(pass-if-equal "invalid type name"
'(syntax-error define-immutable-record-type
"expected type name"
(define-immutable-record-type
(foobar x y)
foobar?
(x foobar-x)
(y foobar-y))
(foobar x y))
(catch 'syntax-error
(lambda ()
(compile '(define-immutable-record-type
(foobar x y)
foobar?
(x foobar-x)
(y foobar-y))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
(list key whom what form subform))))
(pass-if-equal "invalid constructor spec"
'(syntax-error define-immutable-record-type
"invalid constructor spec"
(define-immutable-record-type :foobar
(make-foobar x y 3)
foobar?
(x foobar-x)
(y foobar-y))
(make-foobar x y 3))
(catch 'syntax-error
(lambda ()
(compile '(define-immutable-record-type :foobar
(make-foobar x y 3)
foobar?
(x foobar-x)
(y foobar-y))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
(list key whom what form subform))))
(pass-if-equal "invalid predicate name"
'(syntax-error define-immutable-record-type
"expected predicate name"
(define-immutable-record-type :foobar
(foobar x y)
(x foobar-x)
(y foobar-y))
(x foobar-x))
(catch 'syntax-error
(lambda ()
(compile '(define-immutable-record-type :foobar
(foobar x y)
(x foobar-x)
(y foobar-y))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
(list key whom what form subform))))
(pass-if-equal "invalid field spec"
'(syntax-error define-record-type
"invalid field spec"
(define-record-type :foobar
(make-foobar x y)
foobar?
(x)
(y foobar-y))
(x))
(catch 'syntax-error
(lambda ()
(compile '(define-record-type :foobar
(make-foobar x y)
foobar?
(x)
(y foobar-y))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
(list key whom what form subform))))
(pass-if-equal "unknown field in constructor spec"
'(syntax-error define-record-type
"unknown field in constructor spec"
(define-record-type :foobar
(make-foobar x z)
foobar?
(x foobar-x)
(y foobar-y))
z)
(catch 'syntax-error
(lambda ()
(compile '(define-record-type :foobar
(make-foobar x z)
foobar?
(x foobar-x)
(y foobar-y))
#:env (current-module))
#f)
(lambda (key whom what src form subform)
(list key whom what form subform)))))
(with-test-prefix "record compatibility" (with-test-prefix "record compatibility"
(pass-if "record?" (pass-if "record?"