X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=ee800dbcf49c0049a70cf9d7451ec9795a43165d;hb=9c9d5baa90383947f6e3ea494a038c840cb6a1c0;hp=3f47435d2ffee76d23b292dd8363adc7e2d3eae2;hpb=c809fde8131b3ffdb6e5c73709e85d918a87c87d;p=ldk-c-bindings diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs index 3f47435..ee800db 100644 --- a/c-bindings-gen/src/main.rs +++ b/c-bindings-gen/src/main.rs @@ -271,7 +271,7 @@ macro_rules! get_module_type_resolver { 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) } } @@ -600,18 +600,31 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty (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); } @@ -677,7 +690,7 @@ fn writeln_opaque(w: &mut W, ident: &syn::Ident, struct_name: writeln!(w, "#[allow(unused)]").unwrap(); writeln!(w, "/// Used only if an object of this type is returned as a trait impl by a method").unwrap(); writeln!(w, "pub(crate) extern \"C\" fn {}_free_void(this_ptr: *mut c_void) {{", struct_name).unwrap(); - writeln!(w, "\tunsafe {{ let _ = Box::from_raw(this_ptr as *mut native{}); }}\n}}", struct_name).unwrap(); + writeln!(w, "\tlet _ = unsafe {{ Box::from_raw(this_ptr as *mut native{}) }};\n}}", struct_name).unwrap(); writeln!(w, "#[allow(unused)]").unwrap(); writeln!(w, "impl {} {{", struct_name).unwrap(); writeln!(w, "\tpub(crate) fn get_native_ref(&self) -> &'static native{} {{", struct_name).unwrap(); @@ -849,7 +862,8 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct, 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(); @@ -1060,17 +1074,38 @@ fn writeln_impl(w: &mut W, w_uses: &mut HashSet {}, (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); @@ -1359,6 +1394,7 @@ fn writeln_impl(w: &mut W, w_uses: &mut HashSet 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!(); } @@ -1430,7 +1466,7 @@ fn create_alias_for_impl(resolved_pa 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 }; @@ -1779,7 +1815,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type }; 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 { @@ -1924,7 +1960,7 @@ fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, w_uses: &mut HashS 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(); @@ -2006,7 +2042,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a> 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() { @@ -2118,7 +2154,7 @@ fn walk_ast_second_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &Crate 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() { @@ -2154,7 +2190,7 @@ fn walk_ast_second_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &Crate } 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), @@ -2183,7 +2219,7 @@ fn walk_ast_first_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut Cr 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 {