From 2c0d4b8aec9fe2493b63ad7d824a9853ba6722b1 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Mon, 12 Jan 2015 22:28:21 -0500 Subject: [PATCH] Undo `local-require` change from 7afeada73de2 Recent changes to contract generation have made this `local-require` unnecessary. Using `require` is preferable since `local-require` can interact poorly with submodules. --- .../typed-racket/utils/require-contract.rkt | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/typed-racket-lib/typed-racket/utils/require-contract.rkt b/typed-racket-lib/typed-racket/utils/require-contract.rkt index 491dc9ca..5356ac81 100644 --- a/typed-racket-lib/typed-racket/utils/require-contract.rkt +++ b/typed-racket-lib/typed-racket/utils/require-contract.rkt @@ -47,22 +47,18 @@ (syntax-parse stx [(require/contract nm:renameable hidden:id cnt lib) - #`(begin (define-syntax nm.nm + #`(begin (require (only-in lib [nm.orig-nm nm.orig-nm-r])) + (define-syntax nm.nm (make-rename-transformer (syntax-property (syntax-property (quote-syntax hidden) 'not-free-identifier=? #t) 'not-provide-all-defined #t))) - (define-ignored hidden - (let () - ;; Use `local-require` in order to use this internal - ;; definition context instead of defining at the top-level. - ;; This avoids top-level hopelessness to do with - ;; `local-expand` and definitions. - (local-require (only-in lib [nm.orig-nm nm.orig-nm-r])) - (contract cnt - (get-alternate nm.orig-nm-r) - '(interface for #,(syntax->datum #'nm.nm)) - (current-contract-region) - (quote nm.nm) - (quote-srcloc nm.nm)))))])) + + (define-ignored hidden + (contract cnt + (get-alternate nm.orig-nm-r) + '(interface for #,(syntax->datum #'nm.nm)) + (current-contract-region) + (quote nm.nm) + (quote-srcloc nm.nm))))]))