remove 'here and 'here-path as distinct exports

pull/9/head
Matthew Butterick 11 years ago
parent 8db3bcaeab
commit 3ca0e08c60

@ -35,8 +35,6 @@
(hash-set! cache-hash 'mod-time (file-or-directory-modify-seconds path)) (hash-set! cache-hash 'mod-time (file-or-directory-modify-seconds path))
(hash-set! cache-hash 'main (dynamic-require path 'main)) (hash-set! cache-hash 'main (dynamic-require path 'main))
(hash-set! cache-hash 'metas (dynamic-require path 'metas)) (hash-set! cache-hash 'metas (dynamic-require path 'metas))
(hash-set! cache-hash 'here (dynamic-require path 'here))
(hash-set! cache-hash 'here-path (dynamic-require path 'here-path))
(void)) (void))
(when (or (not (hash-has-key? (current-cache) path)) (when (or (not (hash-has-key? (current-cache) path))

@ -69,11 +69,7 @@
(cdr main-without-metas))) ;; cdr strips placeholder-root tag (cdr main-without-metas))) ;; cdr strips placeholder-root tag
;; derive 'here & 'here-path from the hash (because they might have been overridden in the source) (provide metas main
(define here (hash-ref metas 'here))
(define here-path (hash-ref metas 'here-path))
(provide metas main here here-path
;; hide the exports that were only for internal use. ;; hide the exports that were only for internal use.
(except-out (all-from-out 'inner) inner-here inner-here-path main-raw #%top)) (except-out (all-from-out 'inner) inner-here inner-here-path main-raw #%top))

@ -291,9 +291,7 @@
(require pollen/lang/inner-lang-helper) (require pollen/lang/inner-lang-helper)
(require-project-require-files) (require-project-require-files)
(let ([main (cached-require ,source-name 'main)] (let ([main (cached-require ,source-name 'main)]
[metas (cached-require ,source-name 'metas)] [metas (cached-require ,source-name 'metas)])
[here (cached-require ,source-name 'here)]
[here-path (cached-require ,source-name 'here-path)])
(local-require pollen/debug pollen/ptree pollen/template pollen/top) (local-require pollen/debug pollen/ptree pollen/template pollen/top)
(include-template #:command-char ,TEMPLATE_FIELD_DELIMITER ,(->string template-name))))) (include-template #:command-char ,TEMPLATE_FIELD_DELIMITER ,(->string template-name)))))

Loading…
Cancel
Save