Get external interfaces / impls working

Issue #1227

Author: marijnh

src/comp/metadata/common.rs

@@ -66,8 +66,9 @@ const tag_crate_hash: uint = 0x28u;
 
 const tag_mod_impl: uint = 0x30u;
 
-const tag_impl_method: uint = 0x31u;
+const tag_item_method: uint = 0x31u;
 const tag_impl_iface: uint = 0x32u;
+const tag_impl_iface_did: uint = 0x33u;
 
 // djb's cdb hashes.
 fn hash_node_id(&&node_id: int) -> uint { ret 177573u ^ (node_id as uint); }

src/comp/metadata/csearch.rs

@@ -10,7 +10,7 @@ export get_type_param_count;
 export lookup_defs;
 export get_tag_variants;
 export get_impls_for_mod;
-export get_impl_methods;
+export get_iface_methods;
 export get_type;
 export get_item_name;
 export get_impl_iface;
@@ -66,33 +66,23 @@ fn get_tag_variants(tcx: ty::ctxt, def: ast::def_id) -> [ty::variant_info] {
 
 fn get_impls_for_mod(cstore: cstore::cstore, def: ast::def_id,
                      name: option::t<ast::ident>)
-    -> [@middle::resolve::_impl] {
+    -> @[@middle::resolve::_impl] {
     let cdata = cstore::get_crate_data(cstore, def.crate).data;
-    let result = [];
-    for did in decoder::get_impls_for_mod(cdata, def.node, def.crate) {
-        let nm = decoder::lookup_item_name(cdata, did.node);
-        if alt name { some(n) { n == nm } none. { true } } {
-            result += [@{did: did,
-                         iface_did: none::<ast::def_id>, // FIXME[impl]
-                         ident: nm,
-                         methods: decoder::lookup_impl_methods(
-                             cdata, did.node, did.crate)}];
-        }
-    }
-    result
+    let resolver = bind translate_def_id(cstore, def.crate, _);
+    decoder::get_impls_for_mod(cdata, def, name, resolver)
 }
 
-fn get_impl_methods(cstore: cstore::cstore, def: ast::def_id)
-    -> [@middle::resolve::method_info] {
+fn get_iface_methods(tcx: ty::ctxt, def: ast::def_id) -> @[ty::method] {
+    let cstore = tcx.sess.get_cstore();
     let cdata = cstore::get_crate_data(cstore, def.crate).data;
-    decoder::lookup_impl_methods(cdata, def.node, def.crate)
+    let resolver = bind translate_def_id(cstore, def.crate, _);
+    decoder::get_iface_methods(cdata, def, tcx, resolver)
 }
 
 fn get_type(tcx: ty::ctxt, def: ast::def_id) -> ty::ty_param_bounds_and_ty {
     let cstore = tcx.sess.get_cstore();
-    let cnum = def.crate;
-    let cdata = cstore::get_crate_data(cstore, cnum).data;
-    let resolver = bind translate_def_id(cstore, cnum, _);
+    let cdata = cstore::get_crate_data(cstore, def.crate).data;
+    let resolver = bind translate_def_id(cstore, def.crate, _);
     decoder::get_type(cdata, def, tcx, resolver)
 }
 

src/comp/metadata/decoder.rs

@@ -26,7 +26,7 @@ export get_crate_deps;
 export get_crate_hash;
 export external_resolver;
 export get_impls_for_mod;
-export lookup_impl_methods;
+export get_iface_methods;
 // A function that takes a def_id relative to the crate being searched and
 // returns a def_id relative to the compilation environment, i.e. if we hit a
 // def_id for an item defined in another crate, somebody needs to figure out
@@ -105,38 +105,52 @@ fn parse_external_def_id(this_cnum: ast::crate_num,
     } else { ret extres(external_def_id); }
 }
 
+fn doc_type(doc: ebml::doc, this_cnum: ast::crate_num, tcx: ty::ctxt,
+            extres: external_resolver) -> ty::t {
+    let tp = ebml::get_doc(doc, tag_items_data_item_type);
+    let def_parser = bind parse_external_def_id(this_cnum, extres, _);
+    parse_ty_data(tp.data, this_cnum, tp.start, def_parser, tcx)
+}
+
 fn item_type(item: ebml::doc, this_cnum: ast::crate_num, tcx: ty::ctxt,
              extres: external_resolver) -> ty::t {
-    let tp = ebml::get_doc(item, tag_items_data_item_type);
-    let def_parser = bind parse_external_def_id(this_cnum, extres, _);
-    let t = parse_ty_data(item.data, this_cnum, tp.start, tp.end - tp.start,
-                          def_parser, tcx);
+    let t = doc_type(item, this_cnum, tcx, extres);
     if family_names_type(item_family(item)) {
-        t = ty::mk_named(tcx, t, @item_name(item));
-    }
-    t
+        ty::mk_named(tcx, t, @item_name(item))
+    } else { t }
 }
 
 fn item_impl_iface(item: ebml::doc, this_cnum: ast::crate_num, tcx: ty::ctxt,
                    extres: external_resolver) -> option::t<ty::t> {
     let result = none;
     ebml::tagged_docs(item, tag_impl_iface) {|ity|
         let def_parser = bind parse_external_def_id(this_cnum, extres, _);
-        let t = parse_ty_data(ity.data, this_cnum, ity.start,
-                              ity.end - ity.start, def_parser, tcx);
+        let t = parse_ty_data(ity.data, this_cnum, ity.start, def_parser,
+                              tcx);
         result = some(t);
     }
     result
 }
 
+fn item_impl_iface_did(item: ebml::doc, this_cnum: ast::crate_num,
+                       extres: external_resolver)
+    -> option::t<ast::def_id> {
+    let result = none;
+    ebml::tagged_docs(item, tag_impl_iface_did) {|doc|
+        let s = str::unsafe_from_bytes(ebml::doc_data(doc));
+        result = some(parse_external_def_id(this_cnum, extres, s));
+    }
+    result
+}
+
 fn item_ty_param_bounds(item: ebml::doc, this_cnum: ast::crate_num,
                         tcx: ty::ctxt, extres: external_resolver)
     -> @[ty::param_bounds] {
     let bounds = [];
     let def_parser = bind parse_external_def_id(this_cnum, extres, _);
     ebml::tagged_docs(item, tag_items_data_item_ty_param_bounds) {|p|
-        bounds += [tydecode::parse_bounds_data(@ebml::doc_data(p), this_cnum,
-                                               def_parser, tcx)];
+        bounds += [tydecode::parse_bounds_data(p.data, p.start,
+                                               this_cnum, def_parser, tcx)];
     }
     @bounds
 }
@@ -211,18 +225,17 @@ fn lookup_def(cnum: ast::crate_num, data: @[u8], did_: ast::def_id) ->
             tid = {crate: cnum, node: tid.node};
             ast::def_variant(tid, did)
           }
+          'I' { ast::def_ty(did) }
         };
     ret def;
 }
 
 fn get_type(data: @[u8], def: ast::def_id, tcx: ty::ctxt,
             extres: external_resolver) -> ty::ty_param_bounds_and_ty {
-    let this_cnum = def.crate;
-    let node_id = def.node;
-    let item = lookup_item(node_id, data);
-    let t = item_type(item, this_cnum, tcx, extres);
+    let item = lookup_item(def.node, data);
+    let t = item_type(item, def.crate, tcx, extres);
     let tp_bounds = if family_has_type_params(item_family(item)) {
-        item_ty_param_bounds(item, this_cnum, tcx, extres)
+        item_ty_param_bounds(item, def.crate, tcx, extres)
     } else { @[] };
     ret {bounds: tp_bounds, ty: t};
 }
@@ -264,51 +277,59 @@ fn get_tag_variants(_data: @[u8], def: ast::def_id, tcx: ty::ctxt,
     ret infos;
 }
 
-fn get_impls_for_mod(data: @[u8], node: ast::node_id, cnum: ast::crate_num)
-    -> [ast::def_id] {
-    let mod_item = lookup_item(node, data), result = [];
-    ebml::tagged_docs(mod_item, tag_mod_impl) {|doc|
-        let did = parse_def_id(ebml::doc_data(doc));
-        result += [{crate: cnum with did}];
-    }
-    result
-}
-
-fn lookup_impl_methods(data: @[u8], node: ast::node_id, cnum: ast::crate_num)
+fn item_impl_methods(data: @[u8], item: ebml::doc, base_tps: uint)
     -> [@middle::resolve::method_info] {
-    let impl_item = lookup_item(node, data), rslt = [];
-    let base_tps = item_ty_param_count(impl_item);
-    ebml::tagged_docs(impl_item, tag_impl_method) {|doc|
+    let rslt = [];
+    ebml::tagged_docs(item, tag_item_method) {|doc|
         let m_did = parse_def_id(ebml::doc_data(doc));
         let mth_item = lookup_item(m_did.node, data);
-        rslt += [@{did: {crate: cnum, node: m_did.node},
+        rslt += [@{did: m_did,
                    n_tps: item_ty_param_count(mth_item) - base_tps,
                    ident: item_name(mth_item)}];
     }
     rslt
 }
 
+fn get_impls_for_mod(data: @[u8], m_def: ast::def_id,
+                     name: option::t<ast::ident>, extres: external_resolver)
+    -> @[@middle::resolve::_impl] {
+    let mod_item = lookup_item(m_def.node, data), result = [];
+    ebml::tagged_docs(mod_item, tag_mod_impl) {|doc|
+        let did = parse_external_def_id(
+            m_def.crate, extres, str::unsafe_from_bytes(ebml::doc_data(doc)));
+        let item = lookup_item(did.node, data), nm = item_name(item);
+        if alt name { some(n) { n == nm } none. { true } } {
+            let base_tps = item_ty_param_count(doc);
+            let i_did = item_impl_iface_did(item, m_def.crate, extres);
+            result += [@{did: did, iface_did: i_did, ident: nm,
+                         methods: item_impl_methods(data, doc, base_tps)}];
+        }
+    }
+    @result
+}
+
+fn get_iface_methods(data: @[u8], def: ast::def_id, tcx: ty::ctxt,
+                     extres: external_resolver) -> @[ty::method] {
+    let item = lookup_item(def.node, data), result = [];
+    ebml::tagged_docs(item, tag_item_method) {|mth|
+        let bounds = item_ty_param_bounds(mth, def.crate, tcx, extres);
+        let name = item_name(mth);
+        let ty = doc_type(mth, def.crate, tcx, extres);
+        let fty = alt ty::struct(tcx, ty) { ty::ty_fn(f) { f } };
+        result += [{ident: name, tps: bounds, fty: fty}];
+    }
+    @result
+}
+
 fn family_has_type_params(fam_ch: u8) -> bool {
-    ret alt fam_ch as char {
-          'c' { false }
-          'f' { true }
-          'u' { true }
-          'p' { true }
-          'F' { true }
-          'U' { true }
-          'P' { true }
-          'y' { true }
-          't' { true }
-          'T' { false }
-          'm' { false }
-          'n' { false }
-          'v' { true }
-          'i' { true }
-        };
+    alt fam_ch as char {
+      'c' | 'T' | 'm' | 'n' { false }
+      'f' | 'u' | 'p' | 'F' | 'U' | 'P' | 'y' | 't' | 'v' | 'i' | 'I' { true }
+    }
 }
 
 fn family_names_type(fam_ch: u8) -> bool {
-    alt fam_ch as char { 'y' | 't' { true } _ { false } }
+    alt fam_ch as char { 'y' | 't' | 'I' { true } _ { false } }
 }
 
 fn read_path(d: ebml::doc) -> {path: str, pos: uint} {
@@ -339,6 +360,8 @@ fn item_family_to_str(fam: u8) -> str {
       'm' { ret "mod"; }
       'n' { ret "native mod"; }
       'v' { ret "tag"; }
+      'i' { ret "impl"; }
+      'I' { ret "iface"; }
     }
 }
 

src/comp/metadata/encoder.rs

@@ -277,12 +277,13 @@ fn encode_info_for_mod(ebml_w: ebml::writer, md: _mod,
 
 fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
                         &index: [entry<int>]) {
+    let tcx = ecx.ccx.tcx;
     alt item.node {
       item_const(_, _) {
         ebml::start_tag(ebml_w, tag_items_data_item);
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 'c' as u8);
-        encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
         encode_symbol(ecx, ebml_w, item.id);
         ebml::end_tag(ebml_w);
       }
@@ -296,7 +297,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
                         impure_fn. { 'f' }
                       } as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
         encode_symbol(ecx, ebml_w, item.id);
         ebml::end_tag(ebml_w);
       }
@@ -315,7 +316,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
         encode_name(ebml_w, item.ident);
         ebml::end_tag(ebml_w);
       }
@@ -324,7 +325,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 't' as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
         encode_name(ebml_w, item.ident);
         for v: variant in variants {
             encode_variant_id(ebml_w, local_def(v.node.id));
@@ -333,13 +334,13 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_tag_variant_info(ecx, ebml_w, item.id, variants, index, tps);
       }
       item_res(_, tps, _, _, ctor_id) {
-        let fn_ty = node_id_to_monotype(ecx.ccx.tcx, ctor_id);
+        let fn_ty = node_id_to_monotype(tcx, ctor_id);
 
         ebml::start_tag(ebml_w, tag_items_data_item);
         encode_def_id(ebml_w, local_def(ctor_id));
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, ty::ty_fn_ret(ecx.ccx.tcx, fn_ty));
+        encode_type(ecx, ebml_w, ty::ty_fn_ret(tcx, fn_ty));
         encode_name(ebml_w, item.ident);
         encode_symbol(ecx, ebml_w, item.id);
         ebml::end_tag(ebml_w);
@@ -354,13 +355,13 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         ebml::end_tag(ebml_w);
       }
       item_obj(_, tps, ctor_id) {
-        let fn_ty = node_id_to_monotype(ecx.ccx.tcx, ctor_id);
+        let fn_ty = node_id_to_monotype(tcx, ctor_id);
 
         ebml::start_tag(ebml_w, tag_items_data_item);
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 'y' as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, ty::ty_fn_ret(ecx.ccx.tcx, fn_ty));
+        encode_type(ecx, ebml_w, ty::ty_fn_ret(tcx, fn_ty));
         encode_name(ebml_w, item.ident);
         ebml::end_tag(ebml_w);
 
@@ -378,18 +379,26 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 'i' as u8);
         encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, node_id_to_monotype(ecx.ccx.tcx, item.id));
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
         encode_name(ebml_w, item.ident);
         for m in methods {
-            ebml::start_tag(ebml_w, tag_impl_method);
+            ebml::start_tag(ebml_w, tag_item_method);
             ebml_w.writer.write(str::bytes(def_to_str(local_def(m.id))));
             ebml::end_tag(ebml_w);
         }
         alt ifce {
           some(_) {
+            encode_symbol(ecx, ebml_w, item.id);
+            let i_ty = ty::lookup_item_type(tcx, local_def(item.id)).ty;
             ebml::start_tag(ebml_w, tag_impl_iface);
-            write_type(ecx, ebml_w, ty::lookup_item_type(
-                ecx.ccx.tcx, local_def(item.id)).ty);
+            write_type(ecx, ebml_w, i_ty);
+            ebml::end_tag(ebml_w);
+            ebml::start_tag(ebml_w, tag_impl_iface_did);
+            alt ty::struct(tcx, i_ty) {
+              ty::ty_iface(did, _) {
+                ebml_w.writer.write(str::bytes(def_to_str(did)));
+              }
+            }
             ebml::end_tag(ebml_w);
           }
           _ {}
@@ -403,13 +412,30 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
             encode_family(ebml_w, 'f' as u8);
             encode_type_param_bounds(ebml_w, ecx, tps + m.tps);
             encode_type(ecx, ebml_w,
-                        node_id_to_monotype(ecx.ccx.tcx, m.id));
+                        node_id_to_monotype(tcx, m.id));
             encode_name(ebml_w, m.ident);
             encode_symbol(ecx, ebml_w, m.id);
             ebml::end_tag(ebml_w);
         }
       }
-      item_iface(_, _) { /* FIXME[impl] */ }
+      item_iface(tps, ms) {
+        ebml::start_tag(ebml_w, tag_items_data_item);
+        encode_def_id(ebml_w, local_def(item.id));
+        encode_family(ebml_w, 'I' as u8);
+        encode_type_param_bounds(ebml_w, ecx, tps);
+        encode_type(ecx, ebml_w, node_id_to_monotype(tcx, item.id));
+        encode_name(ebml_w, item.ident);
+        let i = 0u;
+        for mty in *ty::iface_methods(tcx, local_def(item.id)) {
+            ebml::start_tag(ebml_w, tag_item_method);
+            encode_name(ebml_w, mty.ident);
+            encode_type_param_bounds(ebml_w, ecx, ms[i].tps);
+            encode_type(ecx, ebml_w, ty::mk_fn(tcx, mty.fty));
+            ebml::end_tag(ebml_w);
+            i += 1u;
+        }
+        ebml::end_tag(ebml_w);
+      }
     }
 }