Removed extraneous newline characters from empty pretty printed !begi…

…n statements.
untyped · Mar 16, 2009 · 74a63d4 · 74a63d4
1 parent 956a586
commit 74a63d4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/info.ss b/info.ss
@@ -7,7 +7,7 @@
 
 (define release-notes
   '((p "Changes and additions:")
-    (ul (li "added new XML procedures: " (tt "xml-quotable?") ", " (tt "xml+quotable?") ", " (tt "xml-quote") " and " (tt "xml-empty?") "."))))
+    (ul (li "removed extraneous newlines generated when pretty printing empty begin statements."))))
 
 (define primary-file
   "mirrors.ss")

diff --git a/javascript/render.ss b/javascript/render.ss
@@ -39,18 +39,20 @@
 
 ; Custom printers --------------------------------
 
-; BeginStatement -> void
+; BeginStatement -> doc
 (define (format-BeginStatement stmt)
   (match stmt
     [(struct BeginStatement (_ statements))
-     (if (null? statements)
-         (h-append)
-         (h-append (format-substatement (car statements))
-                   (format-map (lambda (statement)
-                                 (h-append line
-                                           (format-substatement statement)))
-                               (cdr statements)
-                               formatters/StatementList)))]))
+     (format-BeginStatement-substatements statements)]))
+
+; (listof statement) -> doc
+(define (format-BeginStatement-substatements statements)
+  (cond [(null? statements)              (h-append)]
+        [(empty-begin? (car statements)) (format-BeginStatement-substatements (cdr statements))]
+        [(null? (cdr statements))        (format-substatement (car statements))]
+        [else                            (h-append (format-substatement (car statements))
+                                                   line
+                                                   (format-BeginStatement-substatements (cdr statements)))]))
 
 ; Provide statements -----------------------------
 

diff --git a/javascript/struct.ss b/javascript/struct.ss
@@ -11,6 +11,11 @@
 
 ; Procedures -------------------------------------
 
+; statement -> void
+(define (empty-begin? stmt)
+  (and (BeginStatement? stmt)
+       (andmap empty-begin? (BeginStatement-statements stmt)))) 
+
 ; any -> boolean
 (define (javascript? item)
   (or (SourceElement? item)
@@ -36,7 +41,8 @@
 (provide/contract
  [struct (BeginStatement Statement) ([location (or/c region? false/c)]
                                      [statements (listof SourceElement?)])]
- [javascript? procedure?]
+ [empty-begin?            procedure?]
+ [javascript?             procedure?]
  [javascript-declaration? procedure?]
- [javascript-statement? procedure?]
- [javascript-expression? procedure?])
+ [javascript-statement?   procedure?]
+ [javascript-expression?  procedure?])