user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use literal info from the original source when pretty printing expanded ASTs.

Browse source
This commit is contained in:
Michael Sullivan 2012-06-28 15:29:15 -07:00
parent 571d866c0d
commit d91e310982
3 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/rustc/driver/driver.rs
View file

@ -310,22 +310,22 @@ fn pretty_print_input(sess: session, cfg: ast::crate_cfg, input: input,
};
let {crate, tcx} = compile_upto(sess, cfg, input, upto, none);
let mut ann: pprust::pp_ann = pprust::no_ann();
alt ppm {
let ann = alt ppm {
ppm_typed {
ann = {pre: ann_paren_for_expr,
post: {|a|ann_typed_post(option::get(tcx), a)}};
{pre: ann_paren_for_expr,
post: {|a|ann_typed_post(option::get(tcx), a)}}
}
ppm_identified | ppm_expanded_identified {
ann = {pre: ann_paren_for_expr, post: ann_identified_post};
{pre: ann_paren_for_expr, post: ann_identified_post}
}
ppm_expanded | ppm_normal {}
}
ppm_expanded | ppm_normal { pprust::no_ann() }
};
let is_expanded = upto != cu_parse;
let src = codemap::get_filemap(sess.codemap, source_name(input)).src;
io::with_str_reader(*src) { |rdr|
pprust::print_crate(sess.codemap, sess.span_diagnostic, crate,
source_name(input),
rdr, io::stdout(), ann);
rdr, io::stdout(), ann, is_expanded);
}
}