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

More "contract" -> "signature" identifier renaming.

Browse Source
This commit is contained in:
Mike Sperber 2010-10-08 11:51:33 +02:00
parent 91590040dc
commit 1e44fc8e43
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@
(non-signatures
(filter (lambda (maybe)
(syntax-case maybe (:)
((: ?id ?cnt)
((: ?id ?sig)
(begin
(when (not (identifier? #'?id))
(raise-syntax-error #f
@ -50,18 +50,18 @@
#'?id))
(cond
((bound-identifier-mapping-get table #'?id (lambda () #f))
=> (lambda (old-cnt-stx)
(unless (equal? (syntax->datum old-cnt-stx)
(syntax->datum #'?cnt))
=> (lambda (old-sig-stx)
(unless (equal? (syntax->datum old-sig-stx)
(syntax->datum #'?sig))
(raise-syntax-error #f
"Zweite Signaturdeklaration für denselben Namen."
maybe))))
(else
(bound-identifier-mapping-put! table #'?id #'?cnt)))
(bound-identifier-mapping-put! table #'?id #'?sig)))
#f))
((: ?id)
(raise-syntax-error #f "Bei dieser Signaturdeklaration fehlt die Signatur" maybe))
((: ?id ?cnt ?stuff0 ?stuff1 ...)
((: ?id ?sig ?stuff0 ?stuff1 ...)
(raise-syntax-error #f "In der :-Form werden ein Name und eine Signatur erwartet; da steht noch mehr"
(syntax/loc #'?stuff0
(?stuff0 ?stuff1 ...))))
@ -96,11 +96,11 @@
(map (lambda (id)
(cond
((bound-identifier-mapping-get signature-table id (lambda () #f))
=> (lambda (cnt)
=> (lambda (sig)
(bound-identifier-mapping-put! signature-table id #f) ; check for orphaned signatures
(with-syntax ((?id id)
(?cnt cnt))
#'(?id (signature ?cnt)))))
(?sig sig))
#'(?id (signature ?sig)))))
(else
id)))
(syntax->list #'(?id ...))))
@ -159,9 +159,9 @@
(reverse (syntax->list #'(defined-id ...)))))
;; Now handle signatures:
(let ((top-level (reverse (syntax->list (syntax (e1 ...))))))
(let-values (((cnt-table expr-list)
(let-values (((sig-table expr-list)
(extract-signatures top-level)))
(expand-signature-expressions cnt-table expr-list)))))
(expand-signature-expressions sig-table expr-list)))))
((frm e3s e1s def-ids)
(let loop ((e3s #'e3s)
(e1s #'e1s)

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

@ -47,7 +47,7 @@
(non-signatures
(filter (lambda (maybe)
(syntax-case maybe (:)
((: ?id ?cnt)
((: ?id ?sig)
(begin
(when (not (identifier? #'?id))
(raise-syntax-error #f
@ -57,18 +57,18 @@
(let ((real-id (first-order->higher-order #'?id)))
(cond
((bound-identifier-mapping-get table real-id (lambda () #f))
=> (lambda (old-cnt-stx)
(unless (equal? (syntax->datum old-cnt-stx)
(syntax->datum #'?cnt))
=> (lambda (old-sig-stx)
(unless (equal? (syntax->datum old-sig-stx)
(syntax->datum #'?sig))
(raise-syntax-error #f
"Second signature declaration for the same name."
maybe))))
(else
(bound-identifier-mapping-put! table real-id #'?cnt)))
(bound-identifier-mapping-put! table real-id #'?sig)))
#f)))
((: ?id)
(raise-syntax-error #f "Signature declaration is missing a signature." maybe))
((: ?id ?cnt ?stuff0 ?stuff1 ...)
((: ?id ?sig ?stuff0 ?stuff1 ...)
(raise-syntax-error #f "The : form expects a name and a signature; there is more."
(syntax/loc #'?stuff0
(?stuff0 ?stuff1 ...))))
@ -103,11 +103,11 @@
(map (lambda (id)
(cond
((bound-identifier-mapping-get signature-table id (lambda () #f))
=> (lambda (cnt)
=> (lambda (sig)
(bound-identifier-mapping-put! signature-table id #f) ; check for orphaned signatures
(with-syntax ((?id id)
(?cnt cnt))
#'(?id (signature ?cnt)))))
(?sig sig))
#'(?id (signature ?sig)))))
(else
id)))
(syntax->list #'(?id ...))))
@ -166,9 +166,9 @@
(reverse (syntax->list #'(defined-id ...)))))
;; Now handle signatures:
(let ((top-level (reverse (syntax->list (syntax (e1 ...))))))
(let-values (((cnt-table expr-list)
(let-values (((sig-table expr-list)
(extract-signatures top-level)))
(expand-signature-expressions cnt-table expr-list)))))
(expand-signature-expressions sig-table expr-list)))))
((frm e3s e1s def-ids)
(let loop ((e3s #'e3s)
(e1s #'e1s)