suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some error messages for invalid : signature declarations.

Browse Source
This commit is contained in:
Mike Sperber 2010-09-17 17:58:59 +02:00
parent 8bc95ace01
commit 333d82e6df
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collects/deinprogramm/signature/module-begin.rkt
View File

@ -43,8 +43,11 @@
(filter (lambda (maybe)
(syntax-case maybe (:)
((: ?id ?cnt)
(identifier? #'id)
(begin
(when (not (identifier? #'?id))
(raise-syntax-error #f
"Nach dem : sollte ein Bezeichner stehen; da steht was anderes."
#'?id))
(when (bound-identifier-mapping-get table #'?id (lambda () #f))
(raise-syntax-error #f
"Zweite Vertragsdefinition für denselben Namen."
@ -52,9 +55,9 @@
(bound-identifier-mapping-put! table #'?id #'?cnt)
#f))
((: ?id)
(raise-syntax-error 'signatures "Bei dieser Vertragsdefinition fehlt der Vertrag" maybe))
(raise-syntax-error #f "Bei dieser Vertragsdefinition fehlt der Vertrag" maybe))
((: ?id ?cnt ?stuff0 ?stuff1 ...)
(raise-syntax-error 'signatures "In der :-Form werden ein Name und ein Vertrag erwartet; da steht noch mehr"
(raise-syntax-error #f "In der :-Form werden ein Name und ein Vertrag erwartet; da steht noch mehr"
(syntax/loc #'?stuff0
(?stuff0 ?stuff1 ...))))
(_ #t)))

23
collects/lang/private/teach-module-begin.rkt
View File

@ -48,18 +48,23 @@
(filter (lambda (maybe)
(syntax-case maybe (:)
((: ?id ?cnt)
(identifier? #'?id)
(let ((real-id (first-order->higher-order #'?id)))
(when (bound-identifier-mapping-get table real-id (lambda () #f))
(begin
(when (not (identifier? #'?id))
(raise-syntax-error #f
"Second signature declaraton for the same name."
maybe))
(bound-identifier-mapping-put! table real-id #'?cnt)
#f))
"Something that's not an identifier after the :"
#'?id))
(let ((real-id (first-order->higher-order #'?id)))
(when (bound-identifier-mapping-get table real-id (lambda () #f))
(raise-syntax-error #f
"Second signature declaration for the same name."
maybe))
(bound-identifier-mapping-put! table real-id #'?cnt)
#f)))
((: ?id)
(raise-syntax-error 'signatures "Signature declaration is missing a signature." maybe))
(raise-syntax-error #f "Signature declaration is missing a signature." maybe))
((: ?id ?cnt ?stuff0 ?stuff1 ...)
(raise-syntax-error 'signatures "The : form expects a name and a signature; there is more."
(raise-syntax-error #f "The : form expects a name and a signature; there is more."
(syntax/loc #'?stuff0
(?stuff0 ?stuff1 ...))))
(_ #t)))