bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tighten up the hardbreak rules a bit.

Browse source
This commit is contained in:
Graydon Hoare 2011-06-20 17:07:29 +00:00
parent 8cd0695230
commit c051501784
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/comp/pretty/pp.rs
View file

@ -502,7 +502,9 @@ fn word(printer p, str wrd) {
p.pretty_print(STRING(wrd, str::char_len(wrd) as int)); p.pretty_print(STRING(wrd, str::char_len(wrd) as int));
} }
fn huge_word(printer p, str wrd) { p.pretty_print(STRING(wrd, 0xffff)); } fn huge_word(printer p, str wrd) {
p.pretty_print(STRING(wrd, size_infinity));
}
fn zero_word(printer p, str wrd) { p.pretty_print(STRING(wrd, 0)); } fn zero_word(printer p, str wrd) { p.pretty_print(STRING(wrd, 0)); }
@ -512,10 +514,10 @@ fn zerobreak(printer p) { spaces(p, 0u); }
fn space(printer p) { spaces(p, 1u); } fn space(printer p) { spaces(p, 1u); }
fn hardbreak(printer p) { spaces(p, 0xffffu); } fn hardbreak(printer p) { spaces(p, size_infinity as uint); }
fn hardbreak_tok() -> token { fn hardbreak_tok() -> token {
ret BREAK(rec(offset=0, blank_space=0xffff)); ret BREAK(rec(offset=0, blank_space=size_infinity));
} }
// //

4
src/comp/pretty/pprust.rs
View file

@ -183,8 +183,8 @@ fn print_mod(&ps s, ast::_mod _mod) {
} }
for (@ast::item item in _mod.items) { for (@ast::item item in _mod.items) {
// Mod-level item printing we're a little more space-y about. // Mod-level item printing we're a little more space-y about.
hardbreak(s.s);
hardbreak_if_not_bol(s); hardbreak(s.s);
print_item(s, item); print_item(s, item);
} }
print_remaining_comments(s); print_remaining_comments(s);