nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-28 23:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nicer pretty-printing for anon objs. Closes #499.

Browse Source 
(Incidentally, what's the right way to test changes to the
pretty-printer?  There has to be a better way than what I did, which
was to log_err the results of expr_to_str as exprs passed through
trans and glance at the output.)
This commit is contained in:
Lindsey Kuper 2011-07-08 15:00:47 -07:00
parent 4319e7a655
commit 33ce1164e2
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/comp/syntax/print/pprust.rs
View File

@ -986,10 +986,57 @@ fn print_expr(&ps s, &@ast::expr expr) {
print_expr(s, expr);
pclose(s);
}
case (ast::expr_anon_obj(_, _)) {
word(s.s, "anon obj");
// FIXME (issue #499): nicer pretty-printing of anon objs
case (ast::expr_anon_obj(?anon_obj, ?tps)) {
head(s, "obj");
print_type_params(s, tps);
// Fields
popen(s);
fn print_field(&ps s, &ast::anon_obj_field field) {
ibox(s, indent_unit);
print_mutability(s, field.mut);
print_type(s, *field.ty);
space(s.s);
word(s.s, field.ident);
word_space(s, "=");
print_expr(s, field.expr);
end(s);
}
fn get_span(&ast::anon_obj_field f) -> codemap::span {
ret f.ty.span;
}
alt (anon_obj.fields) {
case (none) { }
case (some(?fields)) {
commasep_cmnt_ivec(s, consistent, fields, print_field,
get_span);
}
}
pclose(s);
space(s.s);
bopen(s);
// Methods
for (@ast::method meth in anon_obj.methods) {
let ast::ty_param[] typarams = ~[];
hardbreak_if_not_bol(s);
maybe_print_comment(s, meth.span.lo);
print_fn(s, meth.node.meth.decl, meth.node.meth.proto,
meth.node.ident, typarams);
word(s.s, " ");
print_block(s, meth.node.meth.body);
}
space(s.s);
// With object
alt (anon_obj.with_obj) {
case (none) { }
case (some(?e)) {
word_space(s, "with");
print_expr(s, e);
}
}
bclose(s, expr.span);
}
}
s.ann.post(ann_node);