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

Added annotations to plain for and for* in typed code.

Browse Source
This commit is contained in:
Vincent St-Amour 2010-08-27 17:16:14 -04:00
parent b386f01ee4
commit d3ee52d451
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/typed-scheme/main.rkt
View File

@ -2,7 +2,7 @@
(providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app) (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app for for*)
(except "private/prims.rkt") (except "private/prims.rkt")
(except "private/base-types.rkt") (except "private/base-types.rkt")
(except "private/base-types-extra.rkt")) (except "private/base-types-extra.rkt"))
@ -18,4 +18,4 @@
(for-syntax "private/base-types-extra.rkt")) (for-syntax "private/base-types-extra.rkt"))
(provide (rename-out [with-handlers: with-handlers]) (provide (rename-out [with-handlers: with-handlers])
(for-syntax (all-from-out "private/base-types-extra.rkt")) (for-syntax (all-from-out "private/base-types-extra.rkt"))
assert with-type) assert with-type for for*)

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

@ -23,7 +23,9 @@ This file defines two sorts of primitives. All of them are provided into any mod
: :
(rename-out [define-typed-struct define-struct:] (rename-out [define-typed-struct define-struct:]
[lambda: λ:] [lambda: λ:]
[define-typed-struct/exec define-struct/exec:])) [define-typed-struct/exec define-struct/exec:]
[for/annotation for]
[for*/annotation for*]))
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
racket/base racket/base
@ -427,6 +429,18 @@ This file defines two sorts of primitives. All of them are provided into any mod
c ...) c ...)
ty))])) ty))]))
;; wrap the original for with a type annotation
(define-syntax (for/annotation stx)
(syntax-parse stx
[(_ x ...)
(syntax/loc stx
(ann (for x ...) Void))]))
(define-syntax (for*/annotation stx)
(syntax-parse stx
[(_ x ...)
(syntax/loc stx
(ann (for* x ...) Void))]))
;; we need handle #:when clauses manually because we need to annotate ;; we need handle #:when clauses manually because we need to annotate
;; the type of each nested for ;; the type of each nested for
(define-syntax (for: stx) (define-syntax (for: stx)

4
collects/typed/racket/base.rkt
View File

@ -2,7 +2,7 @@
(providing (libs (except racket/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct) (providing (libs (except racket/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*)
(except typed-scheme/private/prims) (except typed-scheme/private/prims)
(except typed-scheme/private/base-types) (except typed-scheme/private/base-types)
(except typed-scheme/private/base-types-extra)) (except typed-scheme/private/base-types-extra))
@ -18,5 +18,5 @@
(for-syntax typed-scheme/private/base-types-extra)) (for-syntax typed-scheme/private/base-types-extra))
(provide (rename-out [with-handlers: with-handlers] (provide (rename-out [with-handlers: with-handlers]
[define-type-alias define-type]) [define-type-alias define-type])
assert with-type assert with-type for for*
(for-syntax (all-from-out typed-scheme/private/base-types-extra))) (for-syntax (all-from-out typed-scheme/private/base-types-extra)))

4
collects/typed/scheme/base.rkt
View File

@ -2,7 +2,7 @@
(providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct) (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*)
(except typed-scheme/private/prims) (except typed-scheme/private/prims)
(except typed-scheme/private/base-types) (except typed-scheme/private/base-types)
(except typed-scheme/private/base-types-extra)) (except typed-scheme/private/base-types-extra))
@ -18,5 +18,5 @@
(for-syntax typed-scheme/private/base-types-extra)) (for-syntax typed-scheme/private/base-types-extra))
(provide (rename-out [with-handlers: with-handlers] (provide (rename-out [with-handlers: with-handlers]
[define-type-alias define-type]) [define-type-alias define-type])
assert with-type assert with-type for for*
(for-syntax (all-from-out typed-scheme/private/base-types-extra))) (for-syntax (all-from-out typed-scheme/private/base-types-extra)))