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

Made annotations optional for let: and variants.

Browse Source 
original commit: 8aab96faa6cac4fd20b7464693152d1f9a3ad106
This commit is contained in:
Vincent St-Amour 2010-09-16 11:21:21 -04:00
parent 8a94fce374
commit ef623a46b6
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
collects/typed-scheme/private/annotate-classes.rkt
View File

@ -37,11 +37,37 @@
(pattern (~and whole [:annotated-name rhs:expr])
#:with binding (syntax/loc #'whole [ann-name rhs])))
(define-syntax-class optionally-annotated-binding
#:attributes (name ann-name binding rhs)
#:description "optionally type-annotated binding"
#:literals (:)
(pattern b:annotated-binding
#:with name #'b.name
#:with ann-name #'b.ann-name
#:with binding #'b.binding
#:with rhs #'b.rhs)
(pattern (~and whole [n:id rhs:expr])
#:with name #'n
#:with ann-name #'n
#:with binding #'whole))
(define-syntax-class annotated-values-binding
#:attributes ((name 1) (ty 1) (ann-name 1) binding rhs)
(pattern (~and whole [(~describe "sequence of type-annotated identifiers" ([:annotated-name] ...)) rhs:expr])
#:with binding (syntax/loc #'whole [(ann-name ...) rhs])))
(define-syntax-class optionally-annotated-values-binding
#:attributes ((name 1) (ann-name 1) binding rhs)
(pattern b:annotated-values-binding
#:with (name ...) #'(b.name ...)
#:with (ann-name ...) #'(b.ann-name ...)
#:with binding #'b.binding
#:with rhs #'b.rhs)
(pattern (~and whole [(~describe "sequence of optionally type-annotated identifiers" (n:optionally-annotated-formal ...)) rhs:expr])
#:with (name ...) #'(n.name ...)
#:with (ann-name ...) #'(n.ann-name ...)
#:with binding #'whole))
(define-splicing-syntax-class annotated-star-rest
#:attributes (name ann-name ty formal-ty)
#:literals (:)
@ -64,6 +90,17 @@
#:attributes (name ty ann-name)
(pattern [:annotated-name]))
(define-syntax-class optionally-annotated-formal
#:description "optionally annotated variable of the form [x : T] or just x"
#:opaque
#:attributes (name ann-name)
(pattern f:annotated-formal
#:with name #'f.name
#:with ann-name #'f.ann-name)
(pattern f:id
#:with name #'f
#:with ann-name #'f))
(define-syntax-class annotated-formals
#:attributes (ann-formals (arg-ty 1))
#:literals (:)

4
collects/typed-scheme/private/prims.rkt
View File

@ -238,7 +238,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
(let ([mk (lambda (form)
(lambda (stx)
(syntax-parse stx
[(_ (bs:annotated-binding ...) . body)
[(_ (bs:optionally-annotated-binding ...) . body)
(quasisyntax/loc stx (#,form (bs.binding ...) . body))])))])
(values (mk #'let) (mk #'let*) (mk #'letrec))))
@ -246,7 +246,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
(let ([mk (lambda (form)
(lambda (stx)
(syntax-parse stx
[(_ (bs:annotated-values-binding ...) . body)
[(_ (bs:optionally-annotated-values-binding ...) . body)
(quasisyntax/loc stx (#,form (bs.binding ...) . body))])))])
(values (mk #'let-values) (mk #'let*-values) (mk #'letrec-values))))