From 0e5c92491de8ca7dfa4eee17673985559c6b7218 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 30 Nov 2017 10:26:50 -0800 Subject: [PATCH] update comments --- pollen/private/main-base.rkt | 2 +- pollen/private/reader-base.rkt | 13 +++++++------ pollen/private/ts.rktd | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pollen/private/main-base.rkt b/pollen/private/main-base.rkt index 51f1439..3e3ac93 100644 --- a/pollen/private/main-base.rkt +++ b/pollen/private/main-base.rkt @@ -55,7 +55,7 @@ ;; prevents conflicts with other imported Pollen sources [DOC-RAW (datum->syntax #'here (syntax->datum (generate-temporary 'pollen-)))]) #'(#%module-begin - (require pollen/top) ; could be at top of this module, but better to contain it + (require pollen/top) ; we could get this via 'inner, but then we'd have to avoid exporting it (module META-MOD-ID racket/base (provide METAS-ID) diff --git a/pollen/private/reader-base.rkt b/pollen/private/reader-base.rkt index 866b60d..5771f38 100644 --- a/pollen/private/reader-base.rkt +++ b/pollen/private/reader-base.rkt @@ -35,18 +35,19 @@ (define reader-here-path (path-string->here-path path-string)) (define parser-mode-from-reader (infer-parser-mode reader-mode reader-here-path)) (strip-context - (with-syntax* ([HERE-KEY (setup:here-path-key)] + (with-syntax* ([POLLEN-MOD-NAME 'pollen-module] + ;; these exist only in the reader because they are specific to file-based Pollen sources. + ;; an inline Pollen submodule doesn't have "pollen.rkt" or `here-path` + [POLLEN-REQUIRE-AND-PROVIDES (require+provide-directory-require-files path-string)] + [HERE-KEY (setup:here-path-key)] [HERE-PATH reader-here-path] - [POLLEN-MOD-NAME 'pollen-module] - [DIRECTORY-REQUIRES (require+provide-directory-require-files path-string)] [SOURCE-LINES source-stx] [DOC (setup:main-export)] [META-MOD (setup:meta-export)] [PARSER-MODE-FROM-READER parser-mode-from-reader] [POLLEN-MODULE-SYNTAX (let ([mod-stx #'(module POLLEN-MOD-NAME pollen - (define-meta HERE-KEY HERE-PATH) - (provide (all-defined-out)) - DIRECTORY-REQUIRES + (define-meta HERE-KEY HERE-PATH) + POLLEN-REQUIRE-AND-PROVIDES . SOURCE-LINES)]) (syntax-property mod-stx 'parser-mode-from-reader parser-mode-from-reader))]) #'(module runtime-wrapper racket/base diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index d2390e2..f6ef09d 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1511919597 +1512066410