Associate names with types introduced by items

Issue #828

This is not a full solution yet. To really get sane error messages,
we'll also have to guess the name to apply to literals, which seems
non-trivial.

Author: marijnh

src/comp/metadata/decoder.rs

@@ -107,8 +107,12 @@ fn item_type(item: ebml::doc, this_cnum: ast::crate_num, tcx: ty::ctxt,
     }
     let tp = ebml::get_doc(item, tag_items_data_item_type);
     let def_parser = bind parse_external_def_id(this_cnum, extres, _);
-    ret parse_ty_data(item.data, this_cnum, tp.start, tp.end - tp.start,
-                      def_parser, tcx);
+    let t = parse_ty_data(item.data, this_cnum, tp.start, tp.end - tp.start,
+                          def_parser, tcx);
+    if family_names_type(item_family(item)) {
+        t = ty::mk_named(tcx, t, @item_name(item));
+    }
+    t
 }
 
 fn item_ty_param_kinds(item: ebml::doc) -> [ast::kind] {
@@ -307,6 +311,10 @@ fn family_has_type_params(fam_ch: u8) -> bool {
         };
 }
 
+fn family_names_type(fam_ch: u8) -> bool {
+    alt fam_ch as char { 'y' | 't' { true } _ { false } }
+}
+
 fn read_path(d: ebml::doc) -> {path: str, pos: uint} {
     let desc = ebml::doc_data(d);
     let pos = ebml::be_uint_from_bytes(@desc, 0u, 4u);

src/comp/metadata/encoder.rs

@@ -314,6 +314,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_kinds(ebml_w, tps);
         encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_name(ebml_w, item.ident);
         ebml::end_tag(ebml_w);
       }
       item_tag(variants, tps) {
@@ -322,6 +323,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_family(ebml_w, 't' as u8);
         encode_type_param_kinds(ebml_w, tps);
         encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_name(ebml_w, item.ident);
         for v: variant in variants {
             encode_variant_id(ebml_w, local_def(v.node.id));
         }
@@ -336,6 +338,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_kinds(ebml_w, tps);
         encode_type(ecx, ebml_w, ty::ty_fn_ret(ecx.ccx.tcx, fn_ty));
+        encode_name(ebml_w, item.ident);
         encode_symbol(ecx, ebml_w, item.id);
         ebml::end_tag(ebml_w);
 
@@ -356,6 +359,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_kinds(ebml_w, tps);
         encode_type(ecx, ebml_w, ty::ty_fn_ret(ecx.ccx.tcx, fn_ty));
+        encode_name(ebml_w, item.ident);
         ebml::end_tag(ebml_w);
 
         index += [{val: ctor_id, pos: ebml_w.writer.tell()}];

src/comp/middle/resolve.rs

@@ -1712,7 +1712,6 @@ fn find_impls_in_item(i: @ast::item, &impls: [@_impl],
     }
 }
 
-// FIXME[impl] we should probably cache this
 fn find_impls_in_mod(e: env, m: def, &impls: [@_impl],
                      name: option::t<ident>) {
     alt m {

src/comp/middle/trans.rs

@@ -1037,12 +1037,10 @@ fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool,
 
 type get_tydesc_result = {kind: tydesc_kind, result: result};
 
-fn get_tydesc(cx: @block_ctxt, orig_t: ty::t, escapes: bool,
+fn get_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool,
               storage: ty_param_storage, &static_ti: option::t<@tydesc_info>)
    -> get_tydesc_result {
 
-    let t = ty::strip_cname(bcx_tcx(cx), orig_t);
-
     // Is the supplied type a type param? If so, return the passed-in tydesc.
     alt ty::type_param(bcx_tcx(cx), t) {
       some(id) {
@@ -1051,8 +1049,8 @@ fn get_tydesc(cx: @block_ctxt, orig_t: ty::t, escapes: bool,
         } else {
             bcx_tcx(cx).sess.span_bug(cx.sp,
                                       "Unbound typaram in get_tydesc: " +
-                                          "orig_t = " +
-                                          ty_to_str(bcx_tcx(cx), orig_t) +
+                                          "t = " +
+                                          ty_to_str(bcx_tcx(cx), t) +
                                           " ty_param = " +
                                           uint::str(id));
         }
@@ -1071,11 +1069,8 @@ fn get_tydesc(cx: @block_ctxt, orig_t: ty::t, escapes: bool,
     ret {kind: tk_static, result: rslt(cx, info.tydesc)};
 }
 
-fn get_static_tydesc(cx: @block_ctxt, orig_t: ty::t, ty_params: [uint],
+fn get_static_tydesc(cx: @block_ctxt, t: ty::t, ty_params: [uint],
                      is_obj_body: bool) -> @tydesc_info {
-    let t = ty::strip_cname(bcx_tcx(cx), orig_t);
-
-
     alt bcx_ccx(cx).tydescs.find(t) {
       some(info) { ret info; }
       none. {