"Vertrag" -> "Signatur" in a few places.

This commit is contained in:
Mike Sperber 2010-09-17 18:01:57 +02:00
parent 333d82e6df
commit fcdfefea10
5 changed files with 19 additions and 15 deletions

View File

@ -1003,7 +1003,7 @@
((?id ?signature) ((?id ?signature)
(identifier? #'?id) (identifier? #'?id)
(with-syntax ((?error-call (with-syntax ((?error-call
(syntax/loc #'?signature (error "Vertrag hat keinen Generator")))) (syntax/loc #'?signature (error "Signatur hat keinen Generator"))))
#'(?id #'(?id
(or (signature-arbitrary (signature ?signature)) (or (signature-arbitrary (signature ?signature))
?error-call)))) ?error-call))))

View File

@ -406,7 +406,7 @@ prints as:
(check-for-id! (check-for-id!
(syntax ?signature-constructor-name) (syntax ?signature-constructor-name)
"Vertrags-Konstruktor-Name ist kein Bezeichner") "Signaturkonstruktor-Name ist kein Bezeichner")
(check-for-id! (check-for-id!
(syntax ?constructor) (syntax ?constructor)
@ -527,7 +527,7 @@ prints as:
(check-for-id! (check-for-id!
(syntax ?signature-constructor-name) (syntax ?signature-constructor-name)
"Vertrags-Konstruktor-Name ist kein Bezeichner") "Signaturkonstruktor-Name ist kein Bezeichner")
(check-for-id! (check-for-id!
(syntax ?constructor) (syntax ?constructor)

View File

@ -50,14 +50,14 @@
#'?id)) #'?id))
(when (bound-identifier-mapping-get table #'?id (lambda () #f)) (when (bound-identifier-mapping-get table #'?id (lambda () #f))
(raise-syntax-error #f (raise-syntax-error #f
"Zweite Vertragsdefinition für denselben Namen." "Zweite Signaturdeklaration für denselben Namen."
maybe)) maybe))
(bound-identifier-mapping-put! table #'?id #'?cnt) (bound-identifier-mapping-put! table #'?id #'?cnt)
#f)) #f))
((: ?id) ((: ?id)
(raise-syntax-error #f "Bei dieser Vertragsdefinition fehlt der Vertrag" maybe)) (raise-syntax-error #f "Bei dieser Signaturdeklaration fehlt die Signatur" maybe))
((: ?id ?cnt ?stuff0 ?stuff1 ...) ((: ?id ?cnt ?stuff0 ?stuff1 ...)
(raise-syntax-error #f "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 eine Signatur erwartet; da steht noch mehr"
(syntax/loc #'?stuff0 (syntax/loc #'?stuff0
(?stuff0 ?stuff1 ...)))) (?stuff0 ?stuff1 ...))))
(_ #t))) (_ #t)))
@ -79,8 +79,8 @@
(lambda (id thing) (lambda (id thing)
(when thing (when thing
(if (identifier-binding id) (if (identifier-binding id)
(raise-syntax-error #f "Zu einer eingebauten Form kann kein Vertrag erklärt werden" id) (raise-syntax-error #f "Zu einer eingebauten Form kann keine Signatur deklariert werden" id)
(raise-syntax-error #f "Zu diesem Vertrag gibt es keine Definition" id))))) (raise-syntax-error #f "Zu dieser Signatur gibt es keine Definition" id)))))
#'(begin)) #'(begin))
(else (else
(let ((expanded (car exprs))) (let ((expanded (car exprs)))

View File

@ -43,7 +43,7 @@
(with-syntax ((?raise (with-syntax ((?raise
(syntax/loc (syntax/loc
#'?exp #'?exp
(error 'signatures "hier kein Vertrag zulässig, nur normaler Wert")))) (error 'signatures "hier keine Signatur zulässig, nur normaler Wert"))))
#'(when (signature? ?temp) #'(when (signature? ?temp)
?raise)))) ?raise))))
(syntax->list #'((?temp ?exp) ...))))) (syntax->list #'((?temp ?exp) ...)))))
@ -59,14 +59,18 @@
(?name name) (?name name)
(?signature-expr (parse-signature #f #'?signature))) (?signature-expr (parse-signature #f #'?signature)))
#'(make-list-signature '?name ?signature-expr ?stx))) #'(make-list-signature '?name ?signature-expr ?stx)))
((list ?signature1 ?rest ...)
(raise-syntax-error #f
"list-Signatur darf nur einen Operanden haben."
(syntax ?signature1)))
((list-of ?signature) ((list-of ?signature)
(with-syntax ((?stx (phase-lift stx)) (with-syntax ((?stx (phase-lift stx))
(?name name) (?name name)
(?signature-expr (parse-signature #f #'?signature))) (?signature-expr (parse-signature #f #'?signature)))
#'(make-list-signature '?name ?signature-expr ?stx))) #'(make-list-signature '?name ?signature-expr ?stx)))
((list ?signature1 ?rest ...) ((list-of ?signature)
(raise-syntax-error #f (raise-syntax-error #f
"list-Vertrag darf nur einen Operanden haben." "list-of-Signatur darf nur einen Operanden haben."
(syntax ?signature1))) (syntax ?signature1)))
((?arg-signature ... -> ?return-signature) ((?arg-signature ... -> ?return-signature)
(with-syntax ((?stx (phase-lift stx)) (with-syntax ((?stx (phase-lift stx))
@ -78,7 +82,7 @@
#'(make-procedure-signature '?name (list ?arg-signature-exprs ...) ?return-signature-expr ?stx))) #'(make-procedure-signature '?name (list ?arg-signature-exprs ...) ?return-signature-expr ?stx)))
((?arg-signature ... -> ?return-signature1 ?return-signature2 . ?_) ((?arg-signature ... -> ?return-signature1 ?return-signature2 . ?_)
(raise-syntax-error #f (raise-syntax-error #f
"Nach dem -> darf nur ein Vertrag stehen." "Nach dem -> darf nur eine Signatur stehen."
(syntax ?return-signature2))) (syntax ?return-signature2)))
((at ?loc ?sig) ((at ?loc ?sig)
(with-syntax ((?sig-expr (parse-signature #f #'?sig))) (with-syntax ((?sig-expr (parse-signature #f #'?sig)))
@ -142,7 +146,7 @@
?stx)))) ?stx))))
(else (else
(raise-syntax-error 'signature (raise-syntax-error 'signature
"ungültiger Vertrag" stx)))) "ungültige Signatur" stx))))
; regrettable ; regrettable
(define signature/signature (define signature/signature

View File

@ -263,8 +263,8 @@
(make-exn:fail:contract (make-exn:fail:contract
(string->immutable-string (string->immutable-string
(if name (if name
(format "rekursiver Vertrag: ~a" name) (format "rekursive Signatur: ~a" name)
"rekursiver Vertrag")) "rekursive Signatur"))
(current-continuation-marks)))) (current-continuation-marks))))
(else (else
(check-signature (car alternative-signatures) (check-signature (car alternative-signatures)