Simplify definition of (legacy) `typed-scheme' language.

This commit is contained in:
Sam Tobin-Hochstadt 2011-08-16 14:53:56 -04:00
parent 01bc5b2822
commit 5870fec9c9
2 changed files with 7 additions and 23 deletions

View File

@ -1,20 +1,5 @@
#lang s-exp "minimal.rkt" #lang racket/base
(require typed/scheme/base)
(provide (all-from-out typed/scheme/base))
(providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app for for*))
(basics #%module-begin #%top-interaction lambda #%app))
(require typed-scheme/base-env/extra-procs
(rename-in
(except-in typed-scheme/base-env/prims
require-typed-struct
require/typed)
(require-typed-struct-legacy require-typed-struct)
(require/typed-legacy require/typed))
typed-scheme/base-env/base-types
typed-scheme/base-env/base-types-extra
(for-syntax typed-scheme/base-env/base-types-extra))
(provide (rename-out [define-type-alias define-type])
(all-from-out typed-scheme/base-env/prims)
(all-from-out typed-scheme/base-env/base-types)
(all-from-out typed-scheme/base-env/base-types-extra)
assert defined? with-type for for*
(for-syntax (all-from-out typed-scheme/base-env/base-types-extra)))

View File

@ -18,13 +18,12 @@ languages. The @racketmod[typed-scheme] language is equivalent to the
typed-scheme/base-env/base-types typed-scheme/base-env/base-types
typed-scheme/base-env/base-types-extra)) typed-scheme/base-env/base-types-extra))
@(define-syntax-rule (def-racket rts rt arr) @(define-syntax-rule (def-racket rts rt)
(begin (begin
(require (for-label (only-in typed/racket/base require-typed-struct require/typed ->))) (require (for-label (only-in typed/racket/base require-typed-struct require/typed)))
(define arr (racket ->))
(define rts (racket require-typed-struct)) (define rts (racket require-typed-struct))
(define rt (racket require/typed)))) (define rt (racket require/typed))))
@(def-racket rts-id rt-id ->-id) @(def-racket rts-id rt-id)
@defform/subs[#:literals (struct opaque) @defform/subs[#:literals (struct opaque)