let mut module_iter = module.rsplitn(2, "::");
module_iter.next().unwrap();
let module = module_iter.next().unwrap();
- let imports = ImportResolver::new(module.splitn(2, "::").next().unwrap(), &$crate_types.lib_ast.dependencies,
+ let imports = ImportResolver::new(module.splitn(2, "::").next().unwrap(), &$crate_types.lib_ast,
module, &$crate_types.lib_ast.modules.get(module).unwrap().items);
TypeResolver::new(module, imports, $crate_types)
} }
(s, i, generic_args) => {
if let Some(supertrait) = types.crate_types.traits.get(s) {
let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types);
-
- // Blindly assume that the same imports where `supertrait` is defined are also
- // imported here. This will almost certainly break at some point, but it should be
- // a compilation failure when it does so.
- write!(w, "impl").unwrap();
- maybe_write_lifetime_generics(w, &supertrait.generics, types);
- write!(w, " {}", s).unwrap();
- maybe_write_generics(w, &supertrait.generics, generic_args, types, false);
- writeln!(w, " for {} {{", trait_name).unwrap();
-
- impl_trait_for_c!(supertrait, format!(".{}", i), &resolver, generic_args);
- writeln!(w, "}}").unwrap();
+ macro_rules! impl_supertrait {
+ ($s: expr, $supertrait: expr, $i: expr, $generic_args: expr) => {
+ let resolver = get_module_type_resolver!($s, types.crate_libs, types.crate_types);
+
+ // Blindly assume that the same imports where `supertrait` is defined are also
+ // imported here. This will almost certainly break at some point, but it should be
+ // a compilation failure when it does so.
+ write!(w, "impl").unwrap();
+ maybe_write_lifetime_generics(w, &$supertrait.generics, types);
+ write!(w, " {}", $s).unwrap();
+ maybe_write_generics(w, &$supertrait.generics, $generic_args, types, false);
+ writeln!(w, " for {} {{", trait_name).unwrap();
+
+ impl_trait_for_c!($supertrait, format!(".{}", $i), &resolver, $generic_args);
+ writeln!(w, "}}").unwrap();
+ }
+ }
+ impl_supertrait!(s, supertrait, i, generic_args);
+ walk_supertraits!(supertrait, Some(&resolver), (
+ (s, supertrait_i, generic_args) => {
+ if let Some(supertrait) = types.crate_types.traits.get(s) {
+ impl_supertrait!(s, supertrait, format!("{}.{}", i, supertrait_i), generic_args);
+ }
+ }
+ ) );
} else {
do_write_impl_trait(w, s, i, &trait_name);
}
write!(w, "\t}}").unwrap();
},
syn::Fields::Unnamed(fields) => {
- assert!(s.generics.lt_token.is_none());
+ assert!(!s.generics.params.iter()
+ .any(|gen| if let syn::GenericParam::Lifetime(_) = gen { false } else { true }));
writeln!(w, "{} (", types.maybe_resolve_ident(&s.ident).unwrap()).unwrap();
for (idx, field) in fields.unnamed.iter().enumerate() {
write!(w, "\t\t").unwrap();
("core::fmt::Debug", _, _) => {},
(s, t, _) => {
if let Some(supertrait_obj) = types.crate_types.traits.get(s) {
- writeln!(w, "\t\t{}: crate::{} {{", t, s).unwrap();
- writeln!(w, "\t\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},").unwrap();
- writeln!(w, "\t\t\tfree: None,").unwrap();
- for item in supertrait_obj.items.iter() {
- match item {
- syn::TraitItem::Method(m) => {
- write_meth!(m, supertrait_obj, "\t");
+ macro_rules! write_impl_fields {
+ ($s: expr, $supertrait_obj: expr, $t: expr, $pfx: expr, $resolver: expr) => {
+ writeln!(w, "{}\t{}: crate::{} {{", $pfx, $t, $s).unwrap();
+ writeln!(w, "{}\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},", $pfx).unwrap();
+ writeln!(w, "{}\t\tfree: None,", $pfx).unwrap();
+ for item in $supertrait_obj.items.iter() {
+ match item {
+ syn::TraitItem::Method(m) => {
+ write_meth!(m, $supertrait_obj, $pfx);
+ },
+ _ => {},
+ }
+ }
+ walk_supertraits!($supertrait_obj, Some(&$resolver), (
+ ("Clone", _, _) => {
+ writeln!(w, "{}\tcloned: Some({}_{}_cloned),", $pfx, $supertrait_obj.ident, ident).unwrap();
},
- _ => {},
+ (_, _, _) => {}
+ ) );
}
}
+ write_impl_fields!(s, supertrait_obj, t, "\t", types);
+
+ let resolver = get_module_type_resolver!(s, types.crate_libs, types.crate_types);
+ walk_supertraits!(supertrait_obj, Some(&resolver), (
+ (s, t, _) => {
+ if let Some(supertrait_obj) = types.crate_types.traits.get(s) {
+ write_impl_fields!(s, supertrait_obj, t, "\t\t", resolver);
+ write!(w, "\t\t\t}},\n").unwrap();
+ }
+ }
+ ) );
write!(w, "\t\t}},\n").unwrap();
} else {
write_trait_impl_field_assign(w, s, ident);
ExportStatus::NoExport|ExportStatus::TestOnly => continue,
ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
}
+ if m.sig.asyncness.is_some() { continue; }
let mut meth_gen_types = gen_types.push_ctx();
assert!(meth_gen_types.learn_generics(&m.sig.generics, types));
if m.defaultness.is_some() { unimplemented!(); }
let alias_resolver_override;
let alias_resolver = if alias_module != types.module_path {
- alias_resolver_override = ImportResolver::new(types.types.crate_name, &types.crate_types.lib_ast.dependencies,
+ alias_resolver_override = ImportResolver::new(types.types.crate_name, &types.crate_types.lib_ast,
alias_module, &types.crate_types.lib_ast.modules.get(alias_module).unwrap().items);
&alias_resolver_override
} else { &types.types };
write!(w, ")").unwrap();
}
}
- if var.discriminant.is_some() { unimplemented!(); }
write!(&mut constr, ") -> {} {{\n\t{}::{}", e.ident, e.ident, var.ident).unwrap();
if let syn::Fields::Named(fields) = &var.fields {
writeln!(&mut constr, " {{").unwrap();
};
if $ref || new_var {
if $ref {
- write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", $field_ident, $field_ident).unwrap();
+ write!(w, "let mut {}_nonref = Clone::clone({});\n\t\t\t\t", $field_ident, $field_ident).unwrap();
if new_var {
let nonref_ident = format_ident!("{}_nonref", $field_ident);
if $to_c {
use_items.push(item);
}
}
- let import_resolver = ImportResolver::from_borrowed_items(mod_path.splitn(2, "::").next().unwrap(), &libast.dependencies, mod_path, &use_items);
+ let import_resolver = ImportResolver::from_borrowed_items(mod_path.splitn(2, "::").next().unwrap(), libast, mod_path, &use_items);
let mut types = TypeResolver::new(mod_path, import_resolver, crate_types);
writeln!(w, "mod {} {{\n{}", module.ident, DEFAULT_IMPORTS).unwrap();
eprintln!("Converting {} entries...", module);
- let import_resolver = ImportResolver::new(orig_crate, &libast.dependencies, module, items);
+ let import_resolver = ImportResolver::new(orig_crate, libast, module, items);
let mut type_resolver = TypeResolver::new(module, import_resolver, crate_types);
for item in items.iter() {
let ASTModule { ref attrs, ref items, .. } = astmod;
assert_eq!(export_status(&attrs), ExportStatus::Export);
- let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, module, items);
+ let import_resolver = ImportResolver::new(orig_crate, ast_storage, module, items);
let mut types = TypeResolver::new(module, import_resolver, crate_types);
for item in items.iter() {
}
fn walk_private_mod<'a>(ast_storage: &'a FullLibraryAST, orig_crate: &str, module: String, items: &'a syn::ItemMod, crate_types: &mut CrateTypes<'a>) {
- let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, &module, &items.content.as_ref().unwrap().1);
+ let import_resolver = ImportResolver::new(orig_crate, ast_storage, &module, &items.content.as_ref().unwrap().1);
for item in items.content.as_ref().unwrap().1.iter() {
match item {
syn::Item::Mod(m) => walk_private_mod(ast_storage, orig_crate, format!("{}::{}", module, m.ident), m, crate_types),
let ASTModule { ref attrs, ref items, submods: _ } = astmod;
assert_eq!(export_status(&attrs), ExportStatus::Export);
let orig_crate = module.splitn(2, "::").next().unwrap();
- let import_resolver = ImportResolver::new(orig_crate, &ast_storage.dependencies, module, items);
+ let import_resolver = ImportResolver::new(orig_crate, ast_storage, module, items);
for item in items.iter() {
match item {