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

Fix up lazy-requires and dynamic-requires in TR.

Browse Source
This commit is contained in:
Eric Dobson 2013-04-05 20:58:20 -07:00
parent a94c449ff1
commit 611b22ff04
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/tests/typed-racket/unit-tests/parse-type-tests.rkt
View File

@ -6,6 +6,7 @@
(rename-in (types subtype union utils abbrev numeric-tower) (rename-in (types subtype union utils abbrev numeric-tower)
[Un t:Un] [-> t:->] [->* t:->*]) [Un t:Un] [-> t:->] [->* t:->*])
(base-env base-types base-types-extra colon) (base-env base-types base-types-extra colon)
(submod typed-racket/base-env/base-types initialize)
(for-template (base-env base-types base-types-extra base-env colon)) (for-template (base-env base-types base-types-extra base-env colon))
(private parse-type) (private parse-type)
rackunit rackunit
@ -30,7 +31,7 @@
[ty (cdr pr)]) [ty (cdr pr)])
(register-resolved-type-alias (datum->syntax #'here (syntax->datum nm)) ty))) (register-resolved-type-alias (datum->syntax #'here (syntax->datum nm)) ty)))
((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names)) (initialize-type-names)
(define-syntax (run-one stx) (define-syntax (run-one stx)
(syntax-case stx () (syntax-case stx ()

3
collects/tests/typed-racket/unit-tests/type-annotation-test.rkt
View File

@ -7,9 +7,10 @@
(env type-env-structs init-envs) (env type-env-structs init-envs)
(utils tc-utils) (utils tc-utils)
(rep type-rep filter-rep object-rep) (rep type-rep filter-rep object-rep)
(submod typed-racket/base-env/base-types initialize)
rackunit) rackunit)
((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names)) (initialize-type-names)
(provide type-annotation-tests) (provide type-annotation-tests)

4
collects/tests/typed-racket/unit-tests/typecheck-tests.rkt
View File

@ -12,6 +12,7 @@
base-types-extra base-types-extra
base-env-indexing base-structs) base-env-indexing base-structs)
define lambda λ) define lambda λ)
(submod typed-racket/base-env/base-types initialize)
(typecheck typechecker) (typecheck typechecker)
(rep type-rep filter-rep object-rep) (rep type-rep filter-rep object-rep)
(rename-in (types utils union numeric-tower abbrev filter-ops) (rename-in (types utils union numeric-tower abbrev filter-ops)
@ -41,8 +42,7 @@
(provide typecheck-tests g) (provide typecheck-tests g)
(b:init) (n:init) (initialize-structs) (initialize-indexing) (b:init) (n:init) (initialize-structs) (initialize-indexing) (initialize-type-names)
((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names))
(define N -Number) (define N -Number)
(define B -Boolean) (define B -Boolean)

13
collects/typed-racket/typed-racket.rkt
View File

@ -14,19 +14,10 @@
with-type with-type
(for-syntax do-standard-inits)) (for-syntax do-standard-inits))
(module init-base-env racket/base
(require racket/lazy-require)
(provide (rename-out (init init-base-env)))
(lazy-require (typed-racket/base-env/base-env (init))))
(module init-base-env-numeric racket/base
(require racket/lazy-require)
(provide (rename-out (init init-base-env-numeric)))
(lazy-require (typed-racket/base-env/base-env-numeric (init))))
(begin-for-syntax (begin-for-syntax
(require 'init-base-env)
(require 'init-base-env-numeric)
(lazy-require (lazy-require
[typed-racket/base-env/base-env ((init init-base-env))]
[typed-racket/base-env/base-env-numeric ((init init-base-env-numeric))]
[typed-racket/base-env/base-structs (initialize-structs)] [typed-racket/base-env/base-structs (initialize-structs)]
[typed-racket/base-env/base-env-indexing (initialize-indexing)] [typed-racket/base-env/base-env-indexing (initialize-indexing)]
[typed-racket/base-env/base-special-env (initialize-special)] [typed-racket/base-env/base-special-env (initialize-special)]