Tweaks and bug fixes to fast JS rendering mode.

untyped · Aug 5, 2009 · 998abda · 998abda
1 parent 6c0a80a
commit 998abda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/javascript/render-fast.ss b/javascript/render-fast.ss
@@ -34,13 +34,13 @@
                                                        (when expr
                                                          (display-str " = ")
                                                          (display-js expr))]
-      [(struct FunctionDeclaration (_ id args body))   (display-str "function ")
+      [(struct FunctionDeclaration (_ id args body))   (display-str "function")
                                                        (display-js id)
                                                        (display-str "(")
                                                        (display-list ", " args)
                                                        (display-str ") { ")
                                                        (for-each display-js body)
-                                                       (display-str "} ")]
+                                                       (display-str "}")]
       [(struct VariableDeclaration (_ bindings))       (display-str "var ")
                                                        (display-list ", " bindings)
                                                        (display-str "; ")]
@@ -72,7 +72,8 @@
       [(struct NewExpression (_ id args))              (display-str "new ")
                                                        (display-js id)
                                                        (display-str "(")
-                                                       (display-list ", " args)]
+                                                       (display-list ", " args)
+                                                       (display-str ")")]
       [(struct PostfixExpression (_ expr op))          (display-js expr)
                                                        (display-str op)]
       [(struct PrefixExpression (_ op expr))           (display-str op)
@@ -98,15 +99,15 @@
                                                        (display-str " ")
                                                        (display-js rhs)
                                                        (display-str ")")]
-      [(struct FunctionExpression (_ id args body))    (display-str "function ")
+      [(struct FunctionExpression (_ id args body))    (display-str "(function")
                                                        (when id
                                                          (display-js id)
                                                          (display-str " "))
                                                        (display-str "(")
                                                        (display-list ", " args)
                                                        (display-str ") { ")
                                                        (for-each display-js body)
-                                                       (display-str "} ")]
+                                                       (display-str "})")]
       [(struct CallExpression (_ fn args))             (display-js fn)
                                                        (display-str "(")
                                                        (display-list ", " args)

diff --git a/javascript/syntax-test.ss b/javascript/syntax-test.ss
@@ -4,6 +4,7 @@
                      "../test-base.ss"
                      "syntax-internal.ss")
          (prefix-in scheme: scheme/pretty)
+         srfi/13
          "../test-base.ss"
          "expander.ss"
          "render.ss"
@@ -23,7 +24,7 @@
          (with-syntax ([expanded (expand-javascript #'actual)])
            #`(test-case message
                (with-check-info (['compiled expanded])
-                 (check-equal? (javascript->string expanded)
+                 (check-equal? (string-trim-both (javascript->string expanded))
                                expected)))))])))
 
 (define-javascript-syntax (!var-debug [id expr] ...)