diff --git a/collects/typed-scheme/main.rkt b/collects/typed-scheme/main.rkt index 9a8b001b8c..4e9ea23af1 100644 --- a/collects/typed-scheme/main.rkt +++ b/collects/typed-scheme/main.rkt @@ -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))) diff --git a/collects/typed-scheme/scribblings/reference/compatibility-languages.scrbl b/collects/typed-scheme/scribblings/reference/compatibility-languages.scrbl index 0ccdd6d439..7428ccce24 100644 --- a/collects/typed-scheme/scribblings/reference/compatibility-languages.scrbl +++ b/collects/typed-scheme/scribblings/reference/compatibility-languages.scrbl @@ -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-extra)) -@(define-syntax-rule (def-racket rts rt arr) +@(define-syntax-rule (def-racket rts rt) (begin - (require (for-label (only-in typed/racket/base require-typed-struct require/typed ->))) - (define arr (racket ->)) + (require (for-label (only-in typed/racket/base require-typed-struct require/typed))) (define rts (racket require-typed-struct)) (define rt (racket require/typed)))) -@(def-racket rts-id rt-id ->-id) +@(def-racket rts-id rt-id) @defform/subs[#:literals (struct opaque)