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

Print tag names in type error messages. Closes #834.

Browse source
This commit is contained in:
Michael Sullivan 2011-08-18 17:59:17 -07:00
parent 4a894dae8e
commit f8ac788d66
4 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/comp/util/ppaux.rs
View file

@ -18,6 +18,8 @@ import pp::zerobreak;
import pp::hardbreak;
import ast::ty_mach_to_str;
import syntax::ast;
import middle::ast_map;
import metadata::csearch;
fn mode_str(m: &ty::mode) -> str {
alt m {
@ -35,6 +37,17 @@ fn fn_ident_to_string(id: ast::node_id, i: &ast::fn_ident) -> str {
ret alt i { none. { "anon" + int::str(id) } some(s) { s } };
}
fn get_id_ident(cx: &ctxt, id: ast::def_id) -> str {
if (id.crate != ast::local_crate) {
str::connect(cx.ext_map.get(id), "::")
} else {
alt cx.items.find(id.node) {
some(ast_map::node_item(it)) { it.ident }
_ { fail "get_id_ident: can't find item in ast_map" }
}
}
}
fn ty_to_str(cx: &ctxt, typ: &t) -> str {
fn fn_input_to_str(cx: &ctxt, input: &{mode: middle::ty::mode, ty: t}) ->
str {
@ -105,9 +118,7 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str {
s += "(" + str::connect(strs, ",") + ")";
}
ty_tag(id, tps) {
// The user should never see this if the cname is set properly!
s += "<tag#" + int::str(id.crate) + ":" + int::str(id.node) + ">";
s += get_id_ident(cx, id);
if vec::len::<t>(tps) > 0u {
let strs: [str] = ~[];
for typ: t in tps { strs += ~[ty_to_str(cx, typ)]; }
@ -128,8 +139,7 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str {
s += "obj {\n\t" + str::connect(strs, "\n\t") + "\n}";
}
ty_res(id, _, _) {
s +=
"<resource#" + int::str(id.node) + ":" + int::str(id.crate) + ">";
s += get_id_ident(cx, id);
}
ty_var(v) { s += "<T" + int::str(v) + ">"; }
ty_param(id,_) {