Fix up lazy-requires and dynamic-requires in TR.
This commit is contained in:
parent
a94c449ff1
commit
611b22ff04
|
@ -6,6 +6,7 @@
|
|||
(rename-in (types subtype union utils abbrev numeric-tower)
|
||||
[Un t:Un] [-> t:->] [->* t:->*])
|
||||
(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))
|
||||
(private parse-type)
|
||||
rackunit
|
||||
|
@ -30,7 +31,7 @@
|
|||
[ty (cdr pr)])
|
||||
(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)
|
||||
(syntax-case stx ()
|
||||
|
|
|
@ -7,9 +7,10 @@
|
|||
(env type-env-structs init-envs)
|
||||
(utils tc-utils)
|
||||
(rep type-rep filter-rep object-rep)
|
||||
(submod typed-racket/base-env/base-types initialize)
|
||||
rackunit)
|
||||
|
||||
((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names))
|
||||
(initialize-type-names)
|
||||
|
||||
(provide type-annotation-tests)
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
base-types-extra
|
||||
base-env-indexing base-structs)
|
||||
define lambda λ)
|
||||
(submod typed-racket/base-env/base-types initialize)
|
||||
(typecheck typechecker)
|
||||
(rep type-rep filter-rep object-rep)
|
||||
(rename-in (types utils union numeric-tower abbrev filter-ops)
|
||||
|
@ -41,8 +42,7 @@
|
|||
|
||||
(provide typecheck-tests g)
|
||||
|
||||
(b:init) (n:init) (initialize-structs) (initialize-indexing)
|
||||
((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names))
|
||||
(b:init) (n:init) (initialize-structs) (initialize-indexing) (initialize-type-names)
|
||||
|
||||
(define N -Number)
|
||||
(define B -Boolean)
|
||||
|
|
|
@ -14,19 +14,10 @@
|
|||
with-type
|
||||
(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
|
||||
(require 'init-base-env)
|
||||
(require 'init-base-env-numeric)
|
||||
(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-env-indexing (initialize-indexing)]
|
||||
[typed-racket/base-env/base-special-env (initialize-special)]
|
||||
|
|
Loading…
Reference in New Issue
Block a user