diff --git a/js-assembler/package.rkt b/js-assembler/package.rkt index 0710adb..7513b51 100644 --- a/js-assembler/package.rkt +++ b/js-assembler/package.rkt @@ -28,6 +28,7 @@ (provide package package-anonymous package-standalone-xhtml + get-inert-code get-standalone-code write-standalone-code get-runtime @@ -297,7 +298,7 @@ MACHINE.modules[~s] = (display *header* op) (display (quote-cdata (string-append (get-runtime) - (get-code source-code) + (get-inert-code source-code) invoke-main-module-code)) op) (display *footer* op)) @@ -454,8 +455,8 @@ EOF )) -;; get-code: source -> string -(define (get-code source-code) +;; get-inert-code: source -> string +(define (get-inert-code source-code) (let ([buffer (open-output-string)]) (package source-code #:should-follow-children? (lambda (src) #t) diff --git a/whalesong-helpers.rkt b/whalesong-helpers.rkt index 60a6513..b154c5d 100644 --- a/whalesong-helpers.rkt +++ b/whalesong-helpers.rkt @@ -50,7 +50,7 @@ (path->string filename) ".xhtml"))]) (unless (directory-exists? (current-output-dir)) - (fprintf (current-report-form) "Creating destination directory ~s" (current-output-dir)) + (fprintf (current-report-port) "Creating destination directory ~s" (current-output-dir)) (make-directory* (current-output-dir))) (parameterize ([current-on-resource (lambda (r) @@ -97,7 +97,7 @@ (path->string filename) ".html"))]) (unless (directory-exists? (current-output-dir)) - (fprintf (current-report-form) "Creating destination directory ~s" (current-output-dir)) + (fprintf (current-report-port) "Creating destination directory ~s" (current-output-dir)) (make-directory* (current-output-dir))) (parameterize ([current-on-resource (lambda (r) @@ -124,7 +124,7 @@ (call-with-output-file* (build-path (current-output-dir) output-js-filename) (lambda (op) (display (get-runtime) op) - (display (get-code (make-ModuleSource (build-path f))) + (display (get-inert-code (make-ModuleSource (build-path f))) op)) #:exists 'replace)