rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

syntax: better formatting of closures in pretty printer and more verbose debugging messages

Browse Source
This commit is contained in:
Daniel Patterson
2012-08-09 19:31:47 -04:00
committed by Brian Anderson
parent 06b2804c27
commit f9946f37aa
2 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libsyntax/print/pp.rs
View File

@@ -254,7 +254,8 @@ impl printer {
self.left = 0u;
self.right = 0u;
} else { self.advance_right(); }
debug!{"pp BEGIN/buffer ~[%u,%u]", self.left, self.right};
debug!{"pp BEGIN(%d)/buffer ~[%u,%u]",
b.offset, self.left, self.right};
self.token[self.right] = t;
self.size[self.right] = -self.right_total;
self.scan_push(self.right);
@@ -278,7 +279,8 @@ impl printer {
self.left = 0u;
self.right = 0u;
} else { self.advance_right(); }
debug!{"pp BREAK/buffer ~[%u,%u]", self.left, self.right};
debug!{"pp BREAK(%d)/buffer ~[%u,%u]",
b.offset, self.left, self.right};
self.check_stack(0);
self.scan_push(self.right);
self.token[self.right] = t;
@@ -287,10 +289,12 @@ impl printer {
}
STRING(s, len) => {
if self.scan_stack_empty {
debug!{"pp STRING/print ~[%u,%u]", self.left, self.right};
debug!{"pp STRING('%s')/print ~[%u,%u]",
*s, self.left, self.right};
self.print(t, len);
} else {
debug!{"pp STRING/buffer ~[%u,%u]", self.left, self.right};
debug!{"pp STRING('%s')/buffer ~[%u,%u]",
*s, self.left, self.right};
self.advance_right();
self.token[self.right] = t;
self.size[self.right] = len;
@@ -444,22 +448,25 @@ impl printer {
let top = self.get_top();
match top.pbreak {
fits => {
debug!{"print BREAK in fitting block"};
debug!{"print BREAK(%d) in fitting block", b.blank_space};
self.space -= b.blank_space;
self.indent(b.blank_space);
}
broken(consistent) => {
debug!{"print BREAK in consistent block"};
debug!{"print BREAK(%d+%d) in consistent block",
top.offset, b.offset};
self.print_newline(top.offset + b.offset);
self.space = self.margin - (top.offset + b.offset);
}
broken(inconsistent) => {
if L > self.space {
debug!{"print BREAK w/ newline in inconsistent"};
debug!{"print BREAK(%d+%d) w/ newline in inconsistent",
top.offset, b.offset};
self.print_newline(top.offset + b.offset);
self.space = self.margin - (top.offset + b.offset);
} else {
debug!{"print BREAK w/o newline in inconsistent"};
debug!{"print BREAK(%d) w/o newline in inconsistent",
b.blank_space};
self.indent(b.blank_space);
self.space -= b.blank_space;
}
@@ -467,7 +474,7 @@ impl printer {
}
}
STRING(s, len) => {
debug!{"print STRING"};
debug!{"print STRING(%s)", *s};
assert (L == len);
// assert L <= space;
self.space -= len;