bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc: Do some plumbing work on nested enums

Browse source
This commit is contained in:
Patrick Walton 2012-08-08 14:17:52 -07:00
parent 166cb1b28b
commit f110e8f21c
12 changed files with 250 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libsyntax/print/pprust.rs
View file

@ -516,18 +516,7 @@ fn print_item(s: ps, &&item: @ast::item) {
word(s.s, ~";");
end(s);
} else {
bopen(s);
for variants.each |v| {
space_if_not_bol(s);
maybe_print_comment(s, v.span.lo);
print_outer_attributes(s, v.node.attrs);
ibox(s, indent_unit);
print_variant(s, v);
word(s.s, ~",");
end(s);
maybe_print_trailing_comment(s, v.span, none::<uint>);
}
bclose(s, item.span);
print_variants(s, variants, item.span);
}
}
ast::item_class(struct_def, tps) => {
@ -582,6 +571,21 @@ fn print_item(s: ps, &&item: @ast::item) {
s.ann.post(ann_node);
}
fn print_variants(s: ps, variants: ~[ast::variant], span: ast::span) {
bopen(s);
for variants.each |v| {
space_if_not_bol(s);
maybe_print_comment(s, v.span.lo);
print_outer_attributes(s, v.node.attrs);
ibox(s, indent_unit);
print_variant(s, v);
word(s.s, ~",");
end(s);
maybe_print_trailing_comment(s, v.span, none::<uint>);
}
bclose(s, span);
}
fn print_struct(s: ps, struct_def: @ast::struct_def, tps: ~[ast::ty_param],
ident: ast::ident, span: ast::span) {
word_nbsp(s, *ident);
@ -710,6 +714,9 @@ fn print_variant(s: ps, v: ast::variant) {
head(s, ~"");
print_struct(s, struct_def, ~[], v.node.name, v.span);
}
ast::enum_variant_kind(variants) => {
print_variants(s, variants, v.span);
}
}
match v.node.disr_expr {
some(d) => {