Revert "another small fix for new expander"

This reverts commit 15539736d2.
pull/175/head
Matthew Butterick 7 years ago
parent 15539736d2
commit 3d8587b052

@ -31,10 +31,10 @@
(define poly-flag (and (has-inner-poly-ext? source-path) (current-poly-target))) (define poly-flag (and (has-inner-poly-ext? source-path) (current-poly-target)))
(define path+mod-time-pairs (define path+mod-time-pairs
(for/list ([ps (in-list path-strings-to-track)]) (for/list ([ps (in-list path-strings-to-track)])
(cond (cond
[ps (define cp (->complete-path ps)) [ps (define cp (->complete-path ps))
(cons (path->string cp) (file-or-directory-modify-seconds cp #f (λ () 0)))] (cons (path->string cp) (file-or-directory-modify-seconds cp #f (λ () 0)))]
[else #f]))) [else #f])))
(list* pollen-env poly-flag (and output-path (path->string output-path)) path+mod-time-pairs)) (list* pollen-env poly-flag (and output-path (path->string output-path)) path+mod-time-pairs))
@ -59,15 +59,14 @@
(raise-argument-error 'path->hash "symbols for doc and meta key" (cons doc-key meta-key))) (raise-argument-error 'path->hash "symbols for doc and meta key" (cons doc-key meta-key)))
;; new namespace forces `dynamic-require` to re-instantiate 'path' ;; new namespace forces `dynamic-require` to re-instantiate 'path'
;; otherwise it gets cached in current namespace. ;; otherwise it gets cached in current namespace.
(define new-ns (make-base-namespace)) (parameterize ([current-namespace (make-base-namespace)]
(namespace-attach-module (namespace-anchor->namespace cache-utils-module-ns) 'pollen/setup new-ns)
(parameterize ([current-namespace new-ns]
[current-directory path-dir]) [current-directory path-dir])
;; I monkeyed around with using the metas submodule to pull out the metas (for speed) ;; I monkeyed around with using the metas submodule to pull out the metas (for speed)
;; but in practice most files get their doc requested too. ;; but in practice most files get their doc requested too.
;; so it's just simpler to get both at once and be done with it. ;; so it's just simpler to get both at once and be done with it.
;; the savings of avoiding two cache fetches at the outset outweighs ;; the savings of avoiding two cache fetches at the outset outweighs
;; the benefit of not reloading doc when you just need metas. ;; the benefit of not reloading doc when you just need metas.
(namespace-attach-module (namespace-anchor->namespace cache-utils-module-ns) 'pollen/setup) ; brings in params
(define doc-missing-thunk (λ () "")) (define doc-missing-thunk (λ () ""))
(define metas-missing-thunk (λ () (hasheq))) (define metas-missing-thunk (λ () (hasheq)))
(list doc-key (dynamic-require path doc-key doc-missing-thunk) (list doc-key (dynamic-require path doc-key doc-missing-thunk)

@ -1 +1 @@
1525627598 1525128463

Loading…
Cancel
Save