OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Buffer pending whitespace in printer so as not to introduce trailing whitespace lines.

Browse Source
This commit is contained in:
Graydon Hoare 2011-06-01 12:01:42 -07:00
parent 681f0c7a2b
commit e5dc138dfa
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/comp/pretty/pp.rs
View File

@ -131,7 +131,8 @@ fn mk_printer(io::writer out, uint linewidth) -> printer {
true, // scan_stack_empty
0u, // top
0u, // bottom
print_stack);
print_stack,
0);
}
/*
@ -236,7 +237,10 @@ obj printer(io::writer out,
mutable uint bottom, // index of bottom of scan_stack
// stack of blocks-in-progress being flushed by print
mutable vec[print_stack_elt] print_stack
mutable vec[print_stack_elt] print_stack,
// buffered indentation to avoid writing trailing whitespace
mutable int pending_indentation
) {
@ -430,16 +434,13 @@ obj printer(io::writer out,
fn print_newline(int amount) {
log #fmt("NEWLINE %d", amount);
out.write_str("\n");
pending_indentation = 0;
self.indent(amount);
}
fn indent(int amount) {
log #fmt("INDENT %d", amount);
auto u = 0;
while (u < amount) {
out.write_str(" ");
u += 1;
}
pending_indentation += amount;
}
fn top() -> print_stack_elt {
@ -452,6 +453,14 @@ obj printer(io::writer out,
ret top;
}
fn write_str(str s) {
while (pending_indentation > 0) {
out.write_str(" ");
pending_indentation -= 1;
}
out.write_str(s);
}
fn print(token x, int L) {
log #fmt("print %s %d (remaining line space=%d)",
tok_str(x), L, space);
@ -515,7 +524,7 @@ obj printer(io::writer out,
assert L == len;
// assert L <= space;
space -= len;
out.write_str(s);
self.write_str(s);
}
case (EOF) {