Support Self in generics in some cases (eg Result<Self, E> in an impl block)

[ldk-c-bindings] / c-bindings-gen / src / main.rs

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index a283c35d40d41d0612836ee3befdee6725f53182..faa51f5460163b759ada3d936855b7bca0ecbe16 100644 (file)
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -225,7 +225,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
        }
        writeln_docs(w, &t.attrs, "");
 
-       let mut gen_types = GenericTypes::new();
+       let mut gen_types = GenericTypes::new(None);
        assert!(gen_types.learn_generics(&t.generics, types));
        gen_types.learn_associated_types(&t, types);
 
@@ -579,7 +579,10 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
        writeln_opaque(w, &s.ident, struct_name, &s.generics, &s.attrs, types, extra_headers, cpp_headers);
 
        if let syn::Fields::Named(fields) = &s.fields {
-               let mut gen_types = GenericTypes::new();
+               let mut self_path_segs = syn::punctuated::Punctuated::new();
+               self_path_segs.push(s.ident.clone().into());
+               let self_path = syn::Path { leading_colon: None, segments: self_path_segs};
+               let mut gen_types = GenericTypes::new(Some((types.resolve_path(&self_path, None), &self_path)));
                assert!(gen_types.learn_generics(&s.generics, types));
 
                let mut all_fields_settable = true;
@@ -674,7 +677,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 
        if let syn::Type::Tuple(_) = &*i.self_ty {
                if types.understood_c_type(&*i.self_ty, None) {
-                       let mut gen_types = GenericTypes::new();
+                       let mut gen_types = GenericTypes::new(None);
                        if !gen_types.learn_generics(&i.generics, types) {
                                eprintln!("Not implementing anything for `impl (..)` due to not understood generics");
                                return;
@@ -701,7 +704,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                if p.qself.is_some() { unimplemented!(); }
                if let Some(ident) = single_ident_generic_path_to_ident(&p.path) {
                        if let Some(resolved_path) = types.maybe_resolve_non_ignored_ident(&ident) {
-                               let mut gen_types = GenericTypes::new();
+                               let mut gen_types = GenericTypes::new(Some((resolved_path.clone(), &p.path)));
                                if !gen_types.learn_generics(&i.generics, types) {
                                        eprintln!("Not implementing anything for impl {} due to not understood generics", ident);
                                        return;
@@ -987,18 +990,30 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
                                                                        write_method_var_decl_body(w, &m.sig, "", types, Some(&meth_gen_types), false);
                                                                        let mut takes_self = false;
                                                                        let mut takes_mut_self = false;
+                                                                       let mut takes_owned_self = false;
                                                                        for inp in m.sig.inputs.iter() {
                                                                                if let syn::FnArg::Receiver(r) = inp {
                                                                                        takes_self = true;
                                                                                        if r.mutability.is_some() { takes_mut_self = true; }
+                                                                                       if r.reference.is_none() { takes_owned_self = true; }
                                                                                }
                                                                        }
-                                                                       if takes_mut_self {
-                                                                               write!(w, "unsafe {{ &mut (*(this_arg.inner as *mut native{})) }}.{}(", ident, m.sig.ident).unwrap();
-                                                                       } else if takes_self {
-                                                                               write!(w, "unsafe {{ &*this_arg.inner }}.{}(", m.sig.ident).unwrap();
-                                                                       } else {
+                                                                       if !takes_mut_self && !takes_self {
                                                                                write!(w, "{}::{}(", resolved_path, m.sig.ident).unwrap();
+                                                                       } else {
+                                                                               match &declared_type {
+                                                                                       DeclType::MirroredEnum => write!(w, "this_arg.to_native().{}(", m.sig.ident).unwrap(),
+                                                                                       DeclType::StructImported => {
+                                                                                               if takes_owned_self {
+                                                                                                       write!(w, "(*unsafe {{ Box::from_raw(this_arg.take_inner()) }}).{}(", m.sig.ident).unwrap();
+                                                                                               } else if takes_mut_self {
+                                                                                                       write!(w, "unsafe {{ &mut (*(this_arg.inner as *mut native{})) }}.{}(", ident, m.sig.ident).unwrap();
+                                                                                               } else {
+                                                                                                       write!(w, "unsafe {{ &*this_arg.inner }}.{}(", m.sig.ident).unwrap();
+                                                                                               }
+                                                                                       },
+                                                                                       _ => unimplemented!(),
+                                                                               }
                                                                        }
                                                                        write_method_call_params(w, &m.sig, "", types, Some(&meth_gen_types), &ret_type, false);
                                                                        writeln!(w, "\n}}\n").unwrap();
@@ -1258,7 +1273,7 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: &
        }
        writeln_docs(w, &f.attrs, "");
 
-       let mut gen_types = GenericTypes::new();
+       let mut gen_types = GenericTypes::new(None);
        if !gen_types.learn_generics(&f.sig.generics, types) { return; }
 
        write!(w, "#[no_mangle]\npub extern \"C\" fn {}(", f.sig.ident).unwrap();