victory

main-helper.rkt

@@ -4,7 +4,7 @@
 (require (for-syntax racket/rerequire pollen/tools pollen/world))
 (require pollen/tools pollen/world)
 
-(provide here-path get-here-path require-extras require-and-provide-extras bound/c
+(provide (except-out (all-defined-out) top~)
          (rename-out (top~ #%top)))
 
 (module+ test (require rackunit))

main.rkt

@@ -34,7 +34,7 @@
      (provide (all-from-out ; pollen file should bring its requires
                pollen/tools))) 
    
-   (require 'pollen-inner) ; provides doc, among other things
+   (require 'pollen-inner) ; provides doc & #%top, among other things
    
    (define here ((bound/c path->pnode) inner-here-path))
    
@@ -68,7 +68,7 @@
    ;; Because if it's overridden to something other than *.ptree, 
    ;; ptree processing will fail.
    ;; This defeats rule that ptree file suffix triggers ptree decoding.
-   (define here-is-ptree? (ptree-source? (->path inner-here-path)))
+   (define here-is-ptree? ((bound/c ptree-source?) (->path inner-here-path)))
    
    (define main (apply (if here-is-ptree?
                            ;; ptree source files will go this way,

render.rkt

@@ -350,7 +350,7 @@
       ;; for include-template (used below)
       (require web-server/templates)
       ;; for ptree navigation functions, and template commands
-      (require pollen/debug pollen/ptree pollen/template)
+      (require pollen/debug pollen/ptree pollen/template pollen/main-helper)
       ;; import source into eval space. This sets up main & metas
       (require ,(->string source-name))
       (parameterize ([current-ptree (make-project-ptree ,PROJECT_ROOT)]