1 files changed, 6 insertions, 4 deletions

@@ -27,8 +27,7 @@
 (module chicken-scratch
     (expand-string
      expand-port
-     def
-     %def/replacer)
+     def %def/replacer)
 
   (import scheme
           (chicken base)
@@ -50,13 +49,16 @@
       (let* ((delim (random-string-not-in str))
              (template (make-concatenated-port
                         (open-input-string (string-append "#<#" delim "\n"))
-                        (open-input-string (irregex-replace "^#!.*\n" str ""))
+                        (open-input-string "#(import chicken-scratch)")
+                        (open-input-string str)
                         (open-input-string (string-append "\n" delim "\n"))))
              (expanded (open-output-string))
              (output (begin
                        (display (eval (read template)) expanded)
                        (get-output-string expanded))))
-        (irregex-replace/all `(seq ,(%def/replacer) (* "\n"))
+        (irregex-replace/all `(: (or "#<unspecified>"
+                                     ,(%def/replacer))
+                                 (* whitespace))
                              output
                              ""))))