add compatibility with new macro expander

main-base.rkt

@@ -9,18 +9,16 @@
              (rename-out [pollen-module-begin #%module-begin]))
     (define-syntax (pollen-module-begin stx)
       (syntax-case stx ()
-        [(_ EXPR (... ...))
+        [(_ expr (... ...))
-         (with-syntax ([DOC (datum->syntax stx (world:current-main-export))]
+         (with-syntax ([EXPRS #'(expr (... ...))])
-                       [INNER (datum->syntax stx ''inner)])
+           (datum->syntax #'EXPRS
-           #'(#%module-begin
+                          `(#%module-begin
                             (module inner pollen/doclang-raw ; exports result as doc-raw
                               (require pollen/top pollen/world)
                               (provide #%top (all-defined-out) (all-from-out pollen/world))
-                EXPR (... ...))
+                              ,@(syntax->datum #'EXPRS))
-              
+                            (require 'inner)
-              (require INNER 'inner) ; import inner twice: INNER for external use, 'inner for internal
+                            (define ,(world:current-main-export)
-              
-              (define DOC
                               (let* ([parser-mode-undefined? (procedure? inner:parser-mode)] ; if undefined, #%top makes it a procedure
                                      [parser-mode (if parser-mode-undefined?
                                                       MODE-ARG
@@ -37,5 +35,4 @@
                                                        (dropf doc-raw (λ(ln) (equal? ln "\n"))) 
                                                        doc-raw)]) ; single line
                                 (apply proc doc-elements)))
-              
+                            (provide ,(world:current-main-export) (except-out (all-from-out 'inner) doc-raw #%top))) #'EXPRS))])))) ; hide internal exports
-              (provide DOC (except-out (all-from-out INNER) doc-raw #%top))))])))) ; hide internal exports

reader-base.rkt

@@ -55,27 +55,28 @@
                             reader-mode))
     (define meta-keys-plus-here (cons (world:current-here-path-key) meta-keys)) ; here-path at front so it can be overridden
     (define meta-values-plus-here (cons reader-here-path meta-values))
-    (with-syntax ([(KEY ...) (datum->syntax source-stx meta-keys-plus-here)]
+    (with-syntax* ([(KEY ...) (datum->syntax source-stx meta-keys-plus-here)]
-                  [(VALUE ...) (datum->syntax source-stx meta-values-plus-here)])
+                   [(VALUE ...) (datum->syntax source-stx meta-values-plus-here)]
+                   [KVS #'(append (list 'KEY VALUE) ...)])
       (syntax-property
-       (replace-context source-stx
+       (datum->syntax source-stx
-                        #`(module runtime-wrapper racket/base
+                      `(module runtime-wrapper racket/base
                          (module metas racket/base
                            (provide (all-defined-out))
-                              (define #,(world:current-meta-export) (apply hash (append (list 'KEY VALUE) ...))))
+                           (define ,(world:current-meta-export) (apply hash ,(syntax->datum #'KVS))))
                          
                          (module pollen-lang-module pollen
-                              (define parser-mode '#,parser-mode) ; change names of exports for local use, to avoid conflicts
+                           (define parser-mode ',parser-mode) ; change names of exports for local use, to avoid conflicts
                            (provide (except-out (all-defined-out) parser-mode)
                                     (prefix-out inner: parser-mode))
-                              #,(require+provide-directory-require-files path-string)
+                           ,(require+provide-directory-require-files path-string)
                            (require (submod ".." ".." metas)) ; get metas from adjacent submodule
                            (provide (all-from-out (submod ".." ".." metas)))
-                              #,@meta-free-file-data)
+                           ,@meta-free-file-data)
                          
                          (require (submod pollen/runtime-config show) 'pollen-lang-module)
                          (provide (all-from-out 'pollen-lang-module))
-                            (show #,(world:current-main-export) inner:parser-mode)))
+                         (show ,(world:current-main-export) inner:parser-mode)) source-stx)
        'module-language
        '#(pollen/language-info get-language-info #f)))))