Don't pp extra lines after block open when preserving whitespace. Closes rust-lang#759

brson · brson · commit 3eef9993af9d · 2011-08-02T17:49:11.000-07:00
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
@@ -172,6 +172,20 @@ fn bclose_(s: &ps, span: codemap::span, indented: uint) {
 }
 fn bclose(s: &ps, span: codemap::span) { bclose_(s, span, indent_unit); }
 
+fn is_begin(s: &ps) -> bool {
+    alt s.s.last_token() {
+      pp::BEGIN(_) { true }
+      _ { false }
+    }
+}
+
+fn is_end(s: &ps) -> bool {
+    alt s.s.last_token() {
+      pp::END. { true }
+      _ { false }
+    }
+}
+
 fn is_bol(s: &ps) -> bool {
     ret s.s.last_token() == pp::EOF ||
         s.s.last_token() == pp::hardbreak_tok();
@@ -1403,7 +1417,7 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
       }
       lexer::blank_line. {
         // We need to do at least one, possibly two hardbreaks.
-        pprust::hardbreak_if_not_bol(s);
+        if is_begin(s) || is_end(s) { hardbreak(s.s) }
         hardbreak(s.s);
       }
     }
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs
@@ -1,4 +1,3 @@
-// xfail-pretty
 
 
 // -*- rust -*-
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs
@@ -1,4 +1,3 @@
-// xfail-pretty
 // based on:
 // http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
 
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
@@ -1,4 +1,3 @@
-// xfail-pretty
 /**
    A parallel word-frequency counting program.
 
diff --git a/src/test/pretty/empty-lines.rs b/src/test/pretty/empty-lines.rs
@@ -0,0 +1,7 @@
+// Issue #759
+// Whitespace under block opening should not expand forever
+
+fn a() -> uint {
+
+    1u
+}
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
@@ -1,4 +1,3 @@
-// xfail-pretty
 /**
    A somewhat reduced test case to expose some Valgrind issues.
 
diff --git a/src/test/run-pass/interior-vec.rs b/src/test/run-pass/interior-vec.rs
@@ -1,4 +1,5 @@
 // xfail-stage0
+// xfail-pretty
 
 import rusti::ivec_len;
 
diff --git a/src/test/run-pass/issue-687.rs b/src/test/run-pass/issue-687.rs
@@ -1,5 +1,4 @@
 // xfail-stage0
-// xfail-pretty
 
 use std;
 import std::ivec;
diff --git a/src/test/run-pass/pattern-bound-var-in-for-each.rs b/src/test/run-pass/pattern-bound-var-in-for-each.rs
@@ -1,5 +1,4 @@
 // xfail-stage0
-// xfail-pretty
 // Tests that trans_path checks whether a
 // pattern-bound var is an upvar (when translating
 // the for-each body)
diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs
@@ -1,4 +1,3 @@
-// xfail-pretty
 
 tag t { a; b(str); }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-pretty`
`2`	`1`
`3`	`2`
`4`	`3`	`// -- rust --`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-pretty`
`2`	`1`	`// based on:`
`3`	`2`	`// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-pretty`
`2`	`1`	`/**`
`3`	`2`	`A parallel word-frequency counting program.`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// xfail-stage0`
	`2`	`+// xfail-pretty`
`2`	`3`
`3`	`4`	`import rusti::ivec_len;`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// xfail-stage0`
`2`		`-// xfail-pretty`
`3`	`2`
`4`	`3`	`use std;`
`5`	`4`	`import std::ivec;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-pretty`
`2`	`1`
`3`	`2`	`tag t { a; b(str); }`
`4`	`3`