From f34a689bd702f649e697946f5fa7caf3fe244be0 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 8 Jul 2013 08:24:12 -0600 Subject: [PATCH] Typed Racket: reference `#%type-decl' through a module path index Avoid problems with absolute paths and bytecode files. --- .../typed-racket-lib/typed-racket/env/env-req.rkt | 2 +- .../typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt index e2ea0fe83a..f4c3957380 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt @@ -8,7 +8,7 @@ (parameterize ([current-namespace ns]) (for ([m (in-list to-require)] #:when m) - (dynamic-require (collapse-module-path '(submod "." #%type-decl) m) + (dynamic-require (module-path-index-join '(submod "." #%type-decl) m) #f)))) (provide add-mod! do-requires) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt index 0c99cdcd5f..87beb73cc9 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt @@ -392,7 +392,8 @@ (match a [(list from to) #`(add-alias (quote-syntax #,from) (quote-syntax #,to))])))) - (begin-for-syntax (add-mod! (quote-module-path)))) + (begin-for-syntax (add-mod! (variable-reference->module-path-index + (#%variable-reference))))) #`(begin #,(if (null? (syntax-e #'(new-provs ...))) #'(begin)