nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the pretty-printer output new-style syntax for records

Browse Source
This commit is contained in:
Marijn Haverbeke 2011-07-26 10:53:24 +02:00
parent ce808bbc6f
commit e123366bff
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,18 +301,18 @@ fn print_type(&ps s, &ast::ty ty) {
pclose(s); pclose(s);
} }
case (ast::ty_rec(?fields)) { case (ast::ty_rec(?fields)) {
word(s.s, "rec"); word(s.s, "{");
popen(s);
fn print_field(&ps s, &ast::ty_field f) { fn print_field(&ps s, &ast::ty_field f) {
cbox(s, indent_unit); cbox(s, indent_unit);
print_mt(s, f.node.mt); print_mutability(s, f.node.mt.mut);
space(s.s);
word(s.s, f.node.ident); word(s.s, f.node.ident);
word_space(s, ":");
print_type(s, *f.node.mt.ty);
end(s); end(s);
} }
fn get_span(&ast::ty_field f) -> codemap::span { ret f.span; } fn get_span(&ast::ty_field f) -> codemap::span { ret f.span; }
commasep_cmnt(s, consistent, fields, print_field, get_span); commasep_cmnt(s, consistent, fields, print_field, get_span);
pclose(s); word(s.s, "}");
} }
case (ast::ty_fn(?proto, ?inputs, ?output, ?cf, ?constrs)) { case (ast::ty_fn(?proto, ?inputs, ?output, ?cf, ?constrs)) {
print_ty_fn(s, proto, none[str], inputs, output, cf, constrs); print_ty_fn(s, proto, none[str], inputs, output, cf, constrs);
@ -707,15 +707,14 @@ fn print_expr(&ps s, &@ast::expr expr) {
ibox(s, indent_unit); ibox(s, indent_unit);
if (field.node.mut == ast::mut) { word_nbsp(s, "mutable"); } if (field.node.mut == ast::mut) { word_nbsp(s, "mutable"); }
word(s.s, field.node.ident); word(s.s, field.node.ident);
word(s.s, "="); word_space(s, ":");
print_expr(s, field.node.expr); print_expr(s, field.node.expr);
end(s); end(s);
} }
fn get_span(&ast::field field) -> codemap::span { fn get_span(&ast::field field) -> codemap::span {
ret field.span; ret field.span;
} }
word(s.s, "rec"); word(s.s, "{");
popen(s);
commasep_cmnt(s, consistent, fields, print_field, get_span); commasep_cmnt(s, consistent, fields, print_field, get_span);
alt (wth) { alt (wth) {
case (some(?expr)) { case (some(?expr)) {
@ -727,7 +726,7 @@ fn print_expr(&ps s, &@ast::expr expr) {
} }
case (_) { } case (_) { }
} }
pclose(s); word(s.s, "}");
} }
case (ast::expr_call(?func, ?args)) { case (ast::expr_call(?func, ?args)) {
print_expr(s, func); print_expr(s, func);