diff --git a/main-base.rkt b/main-base.rkt index 8177916..6b9e36c 100644 --- a/main-base.rkt +++ b/main-base.rkt @@ -27,12 +27,7 @@ (require pollen/top pollen/world) (provide (all-from-out pollen/top pollen/world)) - ;; provide everything defined in pollen source file - ;; change the name of reader-here-path & reader-mode for local use - ;; so they don't conflict if this source is imported into another - (provide (except-out (all-defined-out) reader-here-path reader-mode) - (prefix-out inner: reader-here-path) - (prefix-out inner: reader-mode)) + (provide (all-defined-out)) body-exprs (... ...)) diff --git a/reader-base.rkt b/reader-base.rkt index 72aa893..aca4a0e 100644 --- a/reader-base.rkt +++ b/reader-base.rkt @@ -27,9 +27,15 @@ [(symbol? path-string) (symbol->string path-string)] [(equal? path-string "unsaved editor") path-string] [else (path->string path-string)])) - ,(require+provide-project-require-files path-string) - ,@file-contents) - file-contents))) + ;; change the name of reader-here-path & reader-mode for local use + ;; so they don't conflict if this source is imported into another + (provide (except-out (all-defined-out) reader-here-path reader-mode) + (prefix-out inner: reader-here-path) + (prefix-out inner: reader-mode)) + + ,(require+provide-project-require-files path-string) + ,@file-contents) + file-contents))) (define-syntax-rule (define+provide-reader-in-mode mode)