From ad5018f0dc921eeb8f15f6a904c0428ab3f2e8dd Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Wed, 8 Aug 2012 11:09:36 -0400 Subject: [PATCH] Fix internal require of typed submodules. original commit: 6ae2a9d884d46350411b023d5eb54474f4a5ed81 --- .../typed-racket/succeed/internal-typed-submod.rkt | 11 +++++++++++ collects/typed-racket/env/env-req.rkt | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 collects/tests/typed-racket/succeed/internal-typed-submod.rkt diff --git a/collects/tests/typed-racket/succeed/internal-typed-submod.rkt b/collects/tests/typed-racket/succeed/internal-typed-submod.rkt new file mode 100644 index 00000000..f8362711 --- /dev/null +++ b/collects/tests/typed-racket/succeed/internal-typed-submod.rkt @@ -0,0 +1,11 @@ +#lang typed/racket + +(module zoo typed/racket + (provide tiger) + + (: tiger String) + (define tiger "Tony")) + +(require 'zoo) + +tiger diff --git a/collects/typed-racket/env/env-req.rkt b/collects/typed-racket/env/env-req.rkt index cc70acb5..dde5ae48 100644 --- a/collects/typed-racket/env/env-req.rkt +++ b/collects/typed-racket/env/env-req.rkt @@ -1,5 +1,5 @@ #lang racket/base - +(require syntax/modcollapse) (define to-require null) (define (add-mod! m) (set! to-require (cons m to-require))) @@ -8,6 +8,7 @@ (parameterize ([current-namespace ns]) (for ([m (in-list to-require)] #:when m) - (dynamic-require `(submod ,m #%type-decl) #f)))) + (dynamic-require (collapse-module-path '(submod "." #%type-decl) m) + #f)))) (provide add-mod! do-requires) \ No newline at end of file