//! It also generates relevant memory-management functions and free-standing functions with
//! parameters mapped.
-use std::collections::{HashMap, hash_map};
+use std::collections::{HashMap, hash_map, HashSet};
use std::env;
use std::fs::File;
use std::io::{Read, Write};
const DEFAULT_IMPORTS: &'static str = "
use alloc::str::FromStr;
+use alloc::string::String;
use core::ffi::c_void;
use core::convert::Infallible;
use bitcoin::hashes::Hash;
let mut for_obj_vec = Vec::new();
types.write_c_type(&mut for_obj_vec, for_ty, Some(generics), false);
full_obj_path = String::from_utf8(for_obj_vec).unwrap();
- assert!(full_obj_path.starts_with(TypeResolver::generated_container_path()));
+ if !full_obj_path.starts_with(TypeResolver::generated_container_path()) { return; }
for_obj = full_obj_path[TypeResolver::generated_container_path().len() + 2..].into();
}
writeln!(w, ")").unwrap();
writeln!(w, "}}").unwrap();
+
+ writeln!(w, "#[allow(unused)]").unwrap();
+ writeln!(w, "pub(crate) extern \"C\" fn {}_write_void(obj: *const c_void) -> crate::c_types::derived::CVec_u8Z {{", for_obj).unwrap();
if has_inner {
- writeln!(w, "#[no_mangle]").unwrap();
- writeln!(w, "pub(crate) extern \"C\" fn {}_write_void(obj: *const c_void) -> crate::c_types::derived::CVec_u8Z {{", for_obj).unwrap();
writeln!(w, "\tcrate::c_types::serialize_obj(unsafe {{ &*(obj as *const native{}) }})", for_obj).unwrap();
- writeln!(w, "}}").unwrap();
+ } else {
+ writeln!(w, "\t{}_write(unsafe {{ &*(obj as *const {}) }})", for_obj, for_obj).unwrap();
}
+ writeln!(w, "}}").unwrap();
},
"lightning::util::ser::Readable"|"lightning::util::ser::ReadableArgs"|"lightning::util::ser::MaybeReadable" => {
// Create the Result<Object, DecodeError> syn::Type
- let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, ::ln::msgs::DecodeError>);
+ let mut res_ty: syn::Type = parse_quote!(Result<#for_ty, lightning::ln::msgs::DecodeError>);
writeln!(w, "#[no_mangle]").unwrap();
writeln!(w, "/// Read a {} from a byte array, created by {}_write", for_obj, for_obj).unwrap();
} else { unreachable!(); }
} else { unreachable!(); }
} else if t == "lightning::util::ser::MaybeReadable" {
- res_ty = parse_quote!(Result<Option<#for_ty>, ::ln::msgs::DecodeError>);
+ res_ty = parse_quote!(Result<Option<#for_ty>, lightning::ln::msgs::DecodeError>);
}
write!(w, ") -> ").unwrap();
types.write_c_type(w, &res_ty, Some(generics), false);
let types_opt: Option<&TypeResolver> = $types;
if let Some(types) = types_opt {
if let Some(path) = types.maybe_resolve_path(&supertrait.path, None) {
- match (&path as &str, &supertrait.path.segments.iter().last().unwrap().ident) {
+ let last_seg = supertrait.path.segments.iter().last().unwrap();
+ match (&path as &str, &last_seg.ident, &last_seg.arguments) {
$( $($pat)|* => $e, )*
}
continue;
}
}
if let Some(ident) = supertrait.path.get_ident() {
- match (&format!("{}", ident) as &str, &ident) {
+ match (&format!("{}", ident) as &str, &ident, &syn::PathArguments::None) {
$( $($pat)|* => $e, )*
}
} else if types_opt.is_some() {
} } }
macro_rules! get_module_type_resolver {
- ($module: expr, $crate_libs: expr, $crate_types: expr) => { {
- let module: &str = &$module;
+ ($type_in_module: expr, $crate_types: expr) => { {
+ let module: &str = &$type_in_module;
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)
} }
}
writeln_docs(w, &t.attrs, "");
- let mut gen_types = GenericTypes::new(None);
+ let mut gen_types = GenericTypes::new(Some(format!("{}::{}", types.module_path, trait_name)));
// Add functions which may be required for supertrait implementations.
// Due to borrow checker limitations, we only support one in-crate supertrait here.
let supertrait_name;
let supertrait_resolver;
walk_supertraits!(t, Some(&types), (
- (s, _i) => {
+ (s, _i, _) => {
if let Some(supertrait) = types.crate_types.traits.get(s) {
supertrait_name = s.to_string();
- supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_libs, types.crate_types);
+ supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_types);
gen_types.learn_associated_types(&supertrait, &supertrait_resolver);
break;
}
// the Rust type and a flag to indicate whether deallocation needs to
// happen) as well as provide an Option<>al function pointer which is
// called when the trait method is called which allows updating on the fly.
- write!(w, "\tpub {}: ", m.sig.ident).unwrap();
- generated_fields.push((format!("{}", m.sig.ident), None, None));
+ write!(w, "\tpub {}: core::cell::UnsafeCell<", m.sig.ident).unwrap();
+ generated_fields.push((format!("{}", m.sig.ident), Some(("Clone::clone(unsafe { &*core::cell::UnsafeCell::get(".to_owned(), ")}).into()")), None));
types.write_c_type(w, &*r.elem, Some(&meth_gen_types), false);
- writeln!(w, ",").unwrap();
+ writeln!(w, ">,").unwrap();
writeln!(w, "\t/// Fill in the {} field as a reference to it will be given to Rust after this returns", m.sig.ident).unwrap();
writeln!(w, "\t/// Note that this takes a pointer to this object, not the this_ptr like other methods do").unwrap();
writeln!(w, "\t/// This function pointer may be NULL if {} is filled in when this object is created and never needs updating.", m.sig.ident).unwrap();
writeln!(extra_headers, "struct LDK{};", trait_name).unwrap();
continue;
}
- // Sadly, this currently doesn't do what we want, but it should be easy to get
- // cbindgen to support it. See https://github.com/eqrion/cbindgen/issues/531
- writeln!(w, "\t#[must_use]").unwrap();
}
let mut cpp_docs = Vec::new();
}
// Add functions which may be required for supertrait implementations.
walk_supertraits!(t, Some(&types), (
- ("Clone", _) => {
+ ("Clone", _, _) => {
writeln!(w, "\t/// Called, if set, after this {} has been cloned into a duplicate object.", trait_name).unwrap();
writeln!(w, "\t/// The new {} is provided, and should be mutated as needed to perform a", trait_name).unwrap();
writeln!(w, "\t/// deep copy of the object pointed to by this_arg or avoid any double-freeing.").unwrap();
writeln!(w, "\tpub cloned: Option<extern \"C\" fn (new_{}: &mut {})>,", trait_name, trait_name).unwrap();
generated_fields.push(("cloned".to_owned(), None, None));
},
- ("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
+ ("std::cmp::Eq", _, _)|("core::cmp::Eq", _, _) => {
let eq_docs = "Checks if two objects are equal given this object's this_arg pointer and another object.";
writeln!(w, "\t/// {}", eq_docs).unwrap();
writeln!(w, "\tpub eq: extern \"C\" fn (this_arg: *const c_void, other_arg: &{}) -> bool,", trait_name).unwrap();
generated_fields.push(("eq".to_owned(), None, Some(format!("\t/** {} */\n", eq_docs))));
},
- ("std::hash::Hash", _)|("core::hash::Hash", _) => {
+ ("std::hash::Hash", _, _)|("core::hash::Hash", _, _) => {
let hash_docs_a = "Calculate a succinct non-cryptographic hash for an object given its this_arg pointer.";
let hash_docs_b = "This is used, for example, for inclusion of this object in a hash map.";
writeln!(w, "\t/// {}", hash_docs_a).unwrap();
generated_fields.push(("hash".to_owned(), None,
Some(format!("\t/**\n\t * {}\n\t * {}\n\t */\n", hash_docs_a, hash_docs_b))));
},
- ("Send", _) => {}, ("Sync", _) => {},
- ("std::fmt::Debug", _)|("core::fmt::Debug", _) => {
+ ("Send", _, _) => {}, ("Sync", _, _) => {},
+ ("std::fmt::Debug", _, _)|("core::fmt::Debug", _, _) => {
let debug_docs = "Return a human-readable \"debug\" string describing this object";
writeln!(w, "\t/// {}", debug_docs).unwrap();
writeln!(w, "\tpub debug_str: extern \"C\" fn (this_arg: *const c_void) -> crate::c_types::Str,").unwrap();
generated_fields.push(("debug_str".to_owned(), None,
Some(format!("\t/**\n\t * {}\n\t */\n", debug_docs))));
},
- (s, i) => {
+ (s, i, _) => {
// TODO: Both of the below should expose supertrait methods in C++, but doing so is
// nontrivial.
generated_fields.push(if types.crate_types.traits.get(s).is_none() {
let is_clonable = types.is_clonable(s);
writeln!(w, "\tpub {}: crate::{},", i, s).unwrap();
(format!("{}", i), if !is_clonable {
- Some(format!("crate::{}_clone_fields", s))
+ Some((format!("crate::{}_clone_fields(", s), ")"))
} else { None }, None)
});
}
writeln!(w, "}}").unwrap();
macro_rules! impl_trait_for_c {
- ($t: expr, $impl_accessor: expr, $type_resolver: expr) => {
+ ($t: expr, $impl_accessor: expr, $type_resolver: expr, $generic_impls: expr) => {
+ let mut trait_gen_types = gen_types.push_ctx();
+ assert!(trait_gen_types.learn_generics_with_impls(&$t.generics, $generic_impls, $type_resolver));
for item in $t.items.iter() {
match item {
syn::TraitItem::Method(m) => {
m.sig.abi.is_some() || m.sig.variadic.is_some() {
panic!("1");
}
- let mut meth_gen_types = gen_types.push_ctx();
+ let mut meth_gen_types = trait_gen_types.push_ctx();
assert!(meth_gen_types.learn_generics(&m.sig.generics, $type_resolver));
// Note that we do *not* use the method generics when printing "native"
// rust parts - if the method is generic, we need to print a generic
writeln!(w, "\t\t\t(f)(&self{});", $impl_accessor).unwrap();
write!(w, "\t\t}}\n\t\t").unwrap();
$type_resolver.write_from_c_conversion_to_ref_prefix(w, &*r.elem, Some(&meth_gen_types));
- write!(w, "self{}.{}", $impl_accessor, m.sig.ident).unwrap();
+ write!(w, "unsafe {{ &*self{}.{}.get() }}", $impl_accessor, m.sig.ident).unwrap();
$type_resolver.write_from_c_conversion_to_ref_suffix(w, &*r.elem, Some(&meth_gen_types));
writeln!(w, "\n\t}}").unwrap();
continue;
syn::TypeParamBound::Trait(tr) => {
writeln!(w, "\ttype {} = crate::{};", t.ident, $type_resolver.resolve_path(&tr.path, Some(&gen_types))).unwrap();
for bound in bounds_iter {
- if let syn::TypeParamBound::Trait(_) = bound { panic!("11"); }
+ if let syn::TypeParamBound::Trait(t) = bound {
+ // We only allow for `Sized` here.
+ assert_eq!(t.path.segments.len(), 1);
+ assert_eq!(format!("{}", t.path.segments[0].ident), "Sized");
+ }
}
break;
},
writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap();
writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap();
- writeln!(w, "#[no_mangle]").unwrap();
- writeln!(w, "pub(crate) extern \"C\" fn {}_clone_fields(orig: &{}) -> {} {{", trait_name, trait_name, trait_name).unwrap();
+ writeln!(w, "#[allow(unused)]").unwrap();
+ writeln!(w, "pub(crate) fn {}_clone_fields(orig: &{}) -> {} {{", trait_name, trait_name, trait_name).unwrap();
writeln!(w, "\t{} {{", trait_name).unwrap();
writeln!(w, "\t\tthis_arg: orig.this_arg,").unwrap();
for (field, clone_fn, _) in generated_fields.iter() {
- if let Some(f) = clone_fn {
+ if let Some((pfx, sfx)) = clone_fn {
// If the field isn't clonable, blindly assume its a trait and hope for the best.
- writeln!(w, "\t\t{}: {}(&orig.{}),", field, f, field).unwrap();
+ writeln!(w, "\t\t{}: {}&orig.{}{},", field, pfx, field, sfx).unwrap();
} else {
writeln!(w, "\t\t{}: Clone::clone(&orig.{}),", field, field).unwrap();
}
// Implement supertraits for the C-mapped struct.
walk_supertraits!(t, Some(&types), (
- ("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
+ ("std::cmp::Eq", _, _)|("core::cmp::Eq", _, _) => {
writeln!(w, "impl core::cmp::Eq for {} {{}}", trait_name).unwrap();
writeln!(w, "impl core::cmp::PartialEq for {} {{", trait_name).unwrap();
writeln!(w, "\tfn eq(&self, o: &Self) -> bool {{ (self.eq)(self.this_arg, o) }}\n}}").unwrap();
},
- ("std::hash::Hash", _)|("core::hash::Hash", _) => {
+ ("std::hash::Hash", _, _)|("core::hash::Hash", _, _) => {
writeln!(w, "impl core::hash::Hash for {} {{", trait_name).unwrap();
writeln!(w, "\tfn hash<H: core::hash::Hasher>(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap();
},
- ("Send", _) => {}, ("Sync", _) => {},
- ("Clone", _) => {
+ ("Send", _, _) => {}, ("Sync", _, _) => {},
+ ("Clone", _, _) => {
writeln!(w, "#[no_mangle]").unwrap();
writeln!(w, "/// Creates a copy of a {}", trait_name).unwrap();
writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", trait_name, trait_name, trait_name).unwrap();
writeln!(w, "\t\t{}_clone(self)", trait_name).unwrap();
writeln!(w, "\t}}\n}}").unwrap();
},
- ("std::fmt::Debug", _)|("core::fmt::Debug", _) => {
+ ("std::fmt::Debug", _, _)|("core::fmt::Debug", _, _) => {
writeln!(w, "impl core::fmt::Debug for {} {{", trait_name).unwrap();
writeln!(w, "\tfn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {{").unwrap();
writeln!(w, "\t\tf.write_str((self.debug_str)(self.this_arg).into_str())").unwrap();
writeln!(w, "\t}}").unwrap();
writeln!(w, "}}").unwrap();
},
- (s, i) => {
+ (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, types, false);
- writeln!(w, " for {} {{", trait_name).unwrap();
-
- impl_trait_for_c!(supertrait, format!(".{}", i), &resolver);
- writeln!(w, "}}").unwrap();
+ let resolver = get_module_type_resolver!(s, types.crate_types);
+ macro_rules! impl_supertrait {
+ ($s: expr, $supertrait: expr, $i: expr, $generic_args: expr) => {
+ let resolver = get_module_type_resolver!($s, 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, "impl").unwrap();
maybe_write_lifetime_generics(w, &t.generics, types);
write!(w, " rust{}", t.ident).unwrap();
- maybe_write_generics(w, &t.generics, types, false);
+ maybe_write_generics(w, &t.generics, &syn::PathArguments::None, types, false);
writeln!(w, " for {} {{", trait_name).unwrap();
- impl_trait_for_c!(t, "", types);
+ impl_trait_for_c!(t, "", types, &syn::PathArguments::None);
writeln!(w, "}}\n").unwrap();
writeln!(w, "// We're essentially a pointer already, or at least a set of pointers, so allow us to be used").unwrap();
writeln!(w, "// directly as a Deref trait in higher-level structs:").unwrap();
writeln!(w, "impl core::ops::Deref for {} {{\n\ttype Target = Self;", trait_name).unwrap();
writeln!(w, "\tfn deref(&self) -> &Self {{\n\t\tself\n\t}}\n}}").unwrap();
+ writeln!(w, "impl core::ops::DerefMut for {} {{", trait_name).unwrap();
+ writeln!(w, "\tfn deref_mut(&mut self) -> &mut Self {{\n\t\tself\n\t}}\n}}").unwrap();
}
writeln!(w, "/// Calls the free function if one is set").unwrap();
// https://github.com/eqrion/cbindgen/issues/286 Thus, instead, we import it as a temporary
// name and then reference it by that name, which works around the issue.
write!(w, "\nuse {}::{} as native{}Import;\npub(crate) type native{} = native{}Import", types.module_path, ident, ident, ident, ident).unwrap();
- maybe_write_generics(w, &generics, &types, true);
+ maybe_write_generics(w, &generics, &syn::PathArguments::None, &types, true);
writeln!(w, ";\n").unwrap();
writeln!(extra_headers, "struct native{}Opaque;\ntypedef struct native{}Opaque LDKnative{};", ident, ident, ident).unwrap();
writeln_docs(w, &attrs, "");
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();
write!(w, "inner_val").unwrap();
types.write_to_c_conversion_inline_suffix(w, &ref_type, Some(&gen_types), true);
writeln!(w, "\n}}").unwrap();
+ } else {
+ // If the type isn't reference-able, but is clonable, export a getter that just clones
+ if types.understood_c_type(&$field.ty, Some(&gen_types)) {
+ let mut v = Vec::new();
+ types.write_c_type(&mut v, &$field.ty, Some(&gen_types), true);
+ let s = String::from_utf8(v).unwrap();
+ if types.is_clonable(&s) {
+ writeln_arg_docs(w, &$field.attrs, "", types, Some(&gen_types), vec![].drain(..), Some(&$field.ty));
+ writeln!(w, "///\n/// Returns a copy of the field.").unwrap();
+ write!(w, "#[no_mangle]\npub extern \"C\" fn {}_get_{}(this_ptr: &{}) -> {}", struct_name, $new_name, struct_name, s).unwrap();
+ write!(w, " {{\n\tlet mut inner_val = this_ptr.get_native_mut_ref().{}.clone();\n\t", $real_name).unwrap();
+ let local_var = types.write_to_c_conversion_new_var(w, &format_ident!("inner_val"), &$field.ty, Some(&gen_types), true);
+ if local_var { write!(w, "\n\t").unwrap(); }
+ types.write_to_c_conversion_inline_prefix(w, &$field.ty, Some(&gen_types), true);
+ write!(w, "inner_val").unwrap();
+ types.write_to_c_conversion_inline_suffix(w, &$field.ty, Some(&gen_types), true);
+ writeln!(w, "\n}}").unwrap();
+ }
+ }
}
}
define_field!(('a' as u8 + idx as u8) as char, ('0' as u8 + idx as u8) as char, field);
}
}
- _ => unimplemented!()
+ syn::Fields::Unit => {},
}
if all_fields_settable {
// Build a constructor!
writeln!(w, "/// Constructs a new {} given each field", struct_name).unwrap();
+ match &s.fields {
+ syn::Fields::Named(fields) => {
+ writeln_arg_docs(w, &[], "", types, Some(&gen_types),
+ fields.named.iter().map(|field| (format!("{}_arg", field.ident.as_ref().unwrap()), &field.ty)),
+ None);
+ },
+ syn::Fields::Unnamed(fields) => {
+ writeln_arg_docs(w, &[], "", types, Some(&gen_types),
+ fields.unnamed.iter().enumerate().map(|(idx, field)| (format!("{}_arg", ('a' as u8 + idx as u8)), &field.ty)),
+ None);
+ },
+ syn::Fields::Unit => {},
+ }
write!(w, "#[must_use]\n#[no_mangle]\npub extern \"C\" fn {}_new(", struct_name).unwrap();
match &s.fields {
types.write_c_type(w, &field.ty, Some(&gen_types), false);
}
}
- _ => unreachable!()
+ syn::Fields::Unit => {},
}
write!(w, ") -> {} {{\n\t", struct_name).unwrap();
match &s.fields {
}
}
},
- _ => unreachable!()
+ syn::Fields::Unit => {},
}
write!(w, "{} {{ inner: ObjOps::heap_alloc(", struct_name).unwrap();
match &s.fields {
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();
}
write!(w, "\t)").unwrap();
},
- _ => unreachable!()
+ syn::Fields::Unit => write!(w, "{}::{} {{}}", types.module_path, struct_name).unwrap(),
}
writeln!(w, "), is_owned: true }}\n}}").unwrap();
}
/// Trait struct containing a pointer to the passed struct's inner field and the wrapper functions.
///
/// A few non-crate Traits are hard-coded including Default.
-fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut TypeResolver) {
+fn writeln_impl<W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRandomHash>, i: &syn::ItemImpl, types: &mut TypeResolver) {
match export_status(&i.attrs) {
ExportStatus::Export => {},
ExportStatus::NoExport|ExportStatus::TestOnly => return,
if i.defaultness.is_some() || i.unsafety.is_some() { unimplemented!(); }
if let Some(trait_path) = i.trait_.as_ref() {
if trait_path.0.is_some() { unimplemented!(); }
- if types.understood_c_path(&trait_path.1) {
- let full_trait_path = types.resolve_path(&trait_path.1, None);
- let trait_obj = *types.crate_types.traits.get(&full_trait_path).unwrap();
+ let full_trait_path_opt = types.maybe_resolve_path(&trait_path.1, None);
+ let trait_obj_opt = full_trait_path_opt.as_ref().and_then(|path| types.crate_types.traits.get(path));
+ if types.understood_c_path(&trait_path.1) && trait_obj_opt.is_some() {
+ let full_trait_path = full_trait_path_opt.unwrap();
+ let trait_obj = *trait_obj_opt.unwrap();
let supertrait_name;
let supertrait_resolver;
walk_supertraits!(trait_obj, Some(&types), (
- (s, _i) => {
+ (s, _i, _) => {
if let Some(supertrait) = types.crate_types.traits.get(s) {
supertrait_name = s.to_string();
- supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_libs, types.crate_types);
+ supertrait_resolver = get_module_type_resolver!(supertrait_name, types.crate_types);
gen_types.learn_associated_types(&supertrait, &supertrait_resolver);
break;
}
// mappings from a trai defined in a different file, we may mis-resolve or
// fail to resolve the mapped types. Thus, we have to construct a new
// resolver for the module that the trait was defined in here first.
- let trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_libs, types.crate_types);
+ let mut trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_types);
gen_types.learn_associated_types(trait_obj, &trait_resolver);
let mut impl_associated_types = HashMap::new();
for item in i.items.iter() {
// type-conversion logic without actually knowing the concrete native type.
if !resolved_path.starts_with(types.module_path) {
if !first_seg_is_stdlib(resolved_path.split("::").next().unwrap()) {
- writeln!(w, "use crate::{}::native{} as native{};", resolved_path.rsplitn(2, "::").skip(1).next().unwrap(), ident, ident).unwrap();
- writeln!(w, "use crate::{};", resolved_path).unwrap();
- writeln!(w, "use crate::{}_free_void;", resolved_path).unwrap();
+ w_uses.insert(format!("use crate::{}::native{} as native{};", resolved_path.rsplitn(2, "::").skip(1).next().unwrap(), ident, ident));
+ w_uses.insert(format!("use crate::{};", resolved_path));
+ w_uses.insert(format!("use crate::{}_free_void;", resolved_path));
} else {
- writeln!(w, "use {} as native{};", resolved_path, ident).unwrap();
+ w_uses.insert(format!("use {} as native{};", resolved_path, ident));
}
}
writeln!(w, "impl From<native{}> for crate::{} {{", ident, full_trait_path).unwrap();
if is_type_unconstructable(&resolved_path) {
writeln!(w, "\t\tunreachable!();").unwrap();
} else {
- writeln!(w, "\t\tlet mut rust_obj = {} {{ inner: ObjOps::heap_alloc(obj), is_owned: true }};", ident).unwrap();
- writeln!(w, "\t\tlet mut ret = {}_as_{}(&rust_obj);", ident, trait_obj.ident).unwrap();
- writeln!(w, "\t\t// We want to free rust_obj when ret gets drop()'d, not rust_obj, so wipe rust_obj's pointer and set ret's free() fn").unwrap();
- writeln!(w, "\t\trust_obj.inner = core::ptr::null_mut();").unwrap();
+ types.write_to_c_conversion_new_var(w, &format_ident!("obj"), &*i.self_ty, Some(&gen_types), false);
+ write!(w, "\t\tlet rust_obj = ").unwrap();
+ types.write_to_c_conversion_inline_prefix(w, &*i.self_ty, Some(&gen_types), false);
+ write!(w, "obj").unwrap();
+ types.write_to_c_conversion_inline_suffix(w, &*i.self_ty, Some(&gen_types), false);
+ writeln!(w, ";\n\t\tlet mut ret = {}_as_{}(&rust_obj);", ident, trait_obj.ident).unwrap();
+ writeln!(w, "\t\t// We want to free rust_obj when ret gets drop()'d, not rust_obj, so forget it and set ret's free() fn").unwrap();
+ writeln!(w, "\t\tcore::mem::forget(rust_obj);").unwrap();
writeln!(w, "\t\tret.free = Some({}_free_void);", ident).unwrap();
writeln!(w, "\t\tret").unwrap();
}
writeln!(w, "/// This copies the `inner` pointer in this_arg and thus the returned {} must be freed before this_arg is", trait_obj.ident).unwrap();
write!(w, "#[no_mangle]\npub extern \"C\" fn {}_as_{}(this_arg: &{}) -> crate::{} {{\n", ident, trait_obj.ident, ident, full_trait_path).unwrap();
writeln!(w, "\tcrate::{} {{", full_trait_path).unwrap();
- writeln!(w, "\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},").unwrap();
+ if types.c_type_has_inner_from_path(&resolved_path) {
+ writeln!(w, "\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr((*this_arg).inner) as *mut c_void }},").unwrap();
+ } else {
+ writeln!(w, "\t\tthis_arg: unsafe {{ ObjOps::untweak_ptr(this_arg as *const {} as *mut {}) as *mut c_void }},", ident, ident).unwrap();
+ }
writeln!(w, "\t\tfree: None,").unwrap();
macro_rules! write_meth {
if let syn::Type::Reference(r) = &**rtype {
write!(w, "\n\t\t{}{}: ", $indent, $m.sig.ident).unwrap();
types.write_empty_rust_val(Some(&gen_types), w, &*r.elem);
- writeln!(w, ",\n{}\t\tset_{}: Some({}_{}_set_{}),", $indent, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
+ writeln!(w, ".into(),\n{}\t\tset_{}: Some({}_{}_set_{}),", $indent, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
printed = true;
}
}
}
let mut requires_clone = false;
walk_supertraits!(trait_obj, Some(&types), (
- ("Clone", _) => {
+ ("Clone", _, _) => {
requires_clone = true;
writeln!(w, "\t\tcloned: Some({}_{}_cloned),", trait_obj.ident, ident).unwrap();
},
- ("Sync", _) => {}, ("Send", _) => {},
- ("std::marker::Sync", _) => {}, ("std::marker::Send", _) => {},
- ("core::fmt::Debug", _) => {},
- (s, t) => {
+ ("Sync", _, _) => {}, ("Send", _, _) => {},
+ ("std::marker::Sync", _, _) => {}, ("std::marker::Send", _, _) => {},
+ ("core::fmt::Debug", _, _) => {
+ writeln!(w, "\t\tdebug_str: {}_debug_str_void,", ident).unwrap();
+ },
+ (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_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);
_ => {}
}
}
- if uncallable_function {
- let mut trait_resolver = get_module_type_resolver!(full_trait_path, $types.crate_libs, $types.crate_types);
- write_method_params(w, &$trait_meth.sig, "c_void", &mut trait_resolver, Some(&meth_gen_types), true, true);
- } else {
- write_method_params(w, &$m.sig, "c_void", $types, Some(&meth_gen_types), true, true);
- }
+ write_method_params(w, &$trait_meth.sig, "c_void", &mut trait_resolver, Some(&meth_gen_types), true, true);
write!(w, " {{\n\t").unwrap();
if uncallable_function {
write!(w, "unreachable!();").unwrap();
} else {
- write_method_var_decl_body(w, &$m.sig, "", $types, Some(&meth_gen_types), false);
+ write_method_var_decl_body(w, &$trait_meth.sig, "", &mut trait_resolver, Some(&meth_gen_types), false);
let mut takes_self = false;
for inp in $m.sig.inputs.iter() {
- if let syn::FnArg::Receiver(_) = inp {
- takes_self = true;
+ match inp {
+ syn::FnArg::Receiver(_) => {
+ takes_self = true;
+ break;
+ },
+ syn::FnArg::Typed(ty) => {
+ if let syn::Pat::Ident(id) = &*ty.pat {
+ if format!("{}", id.ident) == "self" {
+ takes_self = true;
+ break;
+ }
+ }
+ }
}
}
- let mut t_gen_args = String::new();
- for (idx, _) in $trait.generics.params.iter().enumerate() {
- if idx != 0 { t_gen_args += ", " };
- t_gen_args += "_"
- }
+ let mut t_gen_args_vec = Vec::new();
+ maybe_write_type_non_lifetime_generics(&mut t_gen_args_vec, &$trait.generics, &trait_resolver);
+ let t_gen_args = String::from_utf8(t_gen_args_vec).unwrap();
if takes_self {
- write!(w, "<native{} as {}<{}>>::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, $trait_path, t_gen_args, $m.sig.ident, ident).unwrap();
+ write!(w, "<native{} as {}{}>::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, $trait_path, t_gen_args, $m.sig.ident, ident).unwrap();
} else {
- write!(w, "<native{} as {}<{}>>::{}(", ident, $trait_path, t_gen_args, $m.sig.ident).unwrap();
+ write!(w, "<native{} as {}{}>::{}(", ident, $trait_path, t_gen_args, $m.sig.ident).unwrap();
}
let mut real_type = "".to_string();
},
_ => {},
}
- write_method_call_params(w, &$m.sig, "", $types, Some(&meth_gen_types), &real_type, false);
+ write_method_call_params(w, &$trait_meth.sig, "", &mut trait_resolver, Some(&meth_gen_types), &real_type, false);
}
write!(w, "\n}}\n").unwrap();
if let syn::ReturnType::Type(_, rtype) = &$m.sig.output {
writeln!(w, "\t// This is a bit race-y in the general case, but for our specific use-cases today, we're safe").unwrap();
writeln!(w, "\t// Specifically, we must ensure that the first time we're called it can never be in parallel").unwrap();
write!(w, "\tif ").unwrap();
- $types.write_empty_rust_val_check(Some(&meth_gen_types), w, &*r.elem, &format!("trait_self_arg.{}", $m.sig.ident));
+ $types.write_empty_rust_val_check(Some(&meth_gen_types), w, &*r.elem, &format!("unsafe {{ &*trait_self_arg.{}.get() }}", $m.sig.ident));
writeln!(w, " {{").unwrap();
- writeln!(w, "\t\tunsafe {{ &mut *(trait_self_arg as *const {} as *mut {}) }}.{} = {}_{}_{}(trait_self_arg.this_arg);", $trait.ident, $trait.ident, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
+ writeln!(w, "\t\t*unsafe {{ &mut *(&*(trait_self_arg as *const {})).{}.get() }} = {}_{}_{}(trait_self_arg.this_arg).into();", $trait.ident, $m.sig.ident, ident, $trait.ident, $m.sig.ident).unwrap();
writeln!(w, "\t}}").unwrap();
writeln!(w, "}}").unwrap();
}
assert!(meth.default.is_some());
let old_gen_types = gen_types;
gen_types = GenericTypes::new(Some(resolved_path.clone()));
- let mut trait_resolver = get_module_type_resolver!(full_trait_path, types.crate_libs, types.crate_types);
impl_meth!(meth, meth, full_trait_path, trait_obj, "", &mut trait_resolver);
gen_types = old_gen_types;
},
writeln!(w, "extern \"C\" fn {}_{}_cloned(new_obj: &mut crate::{}) {{", trait_obj.ident, ident, full_trait_path).unwrap();
writeln!(w, "\tnew_obj.this_arg = {}_clone_void(new_obj.this_arg);", ident).unwrap();
writeln!(w, "\tnew_obj.free = Some({}_free_void);", ident).unwrap();
- walk_supertraits!(trait_obj, Some(&types), (
- (s, t) => {
- if types.crate_types.traits.get(s).is_some() {
- assert!(!types.is_clonable(s)); // We don't currently support cloning with a clonable supertrait
- writeln!(w, "\tnew_obj.{}.this_arg = new_obj.this_arg;", t).unwrap();
- writeln!(w, "\tnew_obj.{}.free = None;", t).unwrap();
+
+ fn seek_supertraits<W: std::io::Write>(w: &mut W, pfx: &str, tr: &syn::ItemTrait, types: &TypeResolver) {
+ walk_supertraits!(tr, Some(types), (
+ (s, t, _) => {
+ if types.crate_types.traits.get(s).is_some() {
+ assert!(!types.is_clonable(s)); // We don't currently support cloning with a clonable supertrait
+ writeln!(w, "\tnew_obj.{}{}.this_arg = new_obj.this_arg;", pfx, t).unwrap();
+ writeln!(w, "\tnew_obj.{}{}.free = None;", pfx, t).unwrap();
+ let tr = types.crate_types.traits.get(s).unwrap();
+ let resolver = get_module_type_resolver!(s, types.crate_types);
+ seek_supertraits(w, &format!("{}.", t), tr, &resolver);
+ }
}
- }
- ) );
+ ) );
+ }
+ seek_supertraits(w, "", trait_obj, types);
writeln!(w, "}}").unwrap();
}
write!(w, "\n").unwrap();
write!(w, "#[must_use]\n#[no_mangle]\npub extern \"C\" fn {}_default() -> {} {{\n", ident, ident).unwrap();
write!(w, "\t{} {{ inner: ObjOps::heap_alloc(Default::default()), is_owned: true }}\n", ident).unwrap();
write!(w, "}}\n").unwrap();
- } else if path_matches_nongeneric(&trait_path.1, &["core", "cmp", "PartialEq"]) {
- } else if path_matches_nongeneric(&trait_path.1, &["core", "cmp", "Eq"]) {
+ } else if full_trait_path_opt.as_ref().map(|s| s.as_str()) == Some("core::cmp::PartialEq") {
+ } else if full_trait_path_opt.as_ref().map(|s| s.as_str()) == Some("core::cmp::Eq") {
writeln!(w, "/// Checks if two {}s contain equal inner contents.", ident).unwrap();
writeln!(w, "/// This ignores pointers and is_owned flags and looks at the values in fields.").unwrap();
if types.c_type_has_inner_from_path(&resolved_path) {
types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
writeln!(w, " {{ true }} else {{ false }}\n}}").unwrap();
- } else if path_matches_nongeneric(&trait_path.1, &["core", "hash", "Hash"]) {
- writeln!(w, "/// Checks if two {}s contain equal inner contents.", ident).unwrap();
+ } else if full_trait_path_opt.as_ref().map(|s| s.as_str()) == Some("core::hash::Hash") {
+ writeln!(w, "/// Generates a non-cryptographic 64-bit hash of the {}.", ident).unwrap();
write!(w, "#[no_mangle]\npub extern \"C\" fn {}_hash(o: &{}) -> u64 {{\n", ident, ident).unwrap();
if types.c_type_has_inner_from_path(&resolved_path) {
write!(w, "\tif o.inner.is_null() {{ return 0; }}\n").unwrap();
types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
writeln!(w, ", &mut hasher);").unwrap();
writeln!(w, "\tcore::hash::Hasher::finish(&hasher)\n}}").unwrap();
- } else if (path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) || path_matches_nongeneric(&trait_path.1, &["Clone"])) &&
- types.c_type_has_inner_from_path(&resolved_path) {
+ } else if (full_trait_path_opt.as_ref().map(|s| s.as_str()) == Some("core::clone::Clone") || path_matches_nongeneric(&trait_path.1, &["Clone"])) &&
+ types.c_type_has_inner_from_path(&resolved_path) {
writeln!(w, "impl Clone for {} {{", ident).unwrap();
writeln!(w, "\tfn clone(&self) -> Self {{").unwrap();
writeln!(w, "\t\tSelf {{").unwrap();
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 {}_clone_void(this_ptr: *const c_void) -> *mut c_void {{", ident).unwrap();
- writeln!(w, "\tBox::into_raw(Box::new(unsafe {{ (*(this_ptr as *mut native{})).clone() }})) as *mut c_void", ident).unwrap();
+ writeln!(w, "\tBox::into_raw(Box::new(unsafe {{ (*(this_ptr as *const native{})).clone() }})) as *mut c_void", ident).unwrap();
writeln!(w, "}}").unwrap();
writeln!(w, "#[no_mangle]").unwrap();
writeln!(w, "/// Creates a copy of the {}", ident).unwrap();
writeln!(w, "\t}}.into()\n}}").unwrap();
}
+ } else if full_trait_path_opt.as_ref().map(|s| s.as_str()) == Some("core::fmt::Debug") {
+ writeln!(w, "/// Get a string which allows debug introspection of a {} object", ident).unwrap();
+ writeln!(w, "pub extern \"C\" fn {}_debug_str_void(o: *const c_void) -> Str {{", ident).unwrap();
+
+ write!(w, "\talloc::format!(\"{{:?}}\", unsafe {{ o as *const crate::{} }}).into()", resolved_path).unwrap();
+ writeln!(w, "}}").unwrap();
} else if path_matches_nongeneric(&trait_path.1, &["Display"]) {
writeln!(w, "#[no_mangle]").unwrap();
writeln!(w, "/// Get the string representation of a {} object", ident).unwrap();
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 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; }
+ match inp {
+ syn::FnArg::Receiver(r) => {
+ takes_self = true;
+ if r.mutability.is_some() { takes_mut_self = true; }
+ if r.reference.is_none() { takes_owned_self = true; }
+ break;
+ },
+ syn::FnArg::Typed(ty) => {
+ if let syn::Pat::Ident(id) = &*ty.pat {
+ if format!("{}", id.ident) == "self" {
+ takes_self = true;
+ if id.mutability.is_some() { takes_mut_self = true; }
+ if id.by_ref.is_none() { takes_owned_self = true; }
+ break;
+ }
+ }
+ }
}
}
if !takes_mut_self && !takes_self {
}
}
} else if let Some(resolved_path) = types.maybe_resolve_ident(&ident) {
- create_alias_for_impl(resolved_path, i, types, move |aliased_impl, types| writeln_impl(w, &aliased_impl, types));
+ create_alias_for_impl(resolved_path, i, types, move |aliased_impl, types| writeln_impl(w, w_uses, &aliased_impl, types));
} else {
eprintln!("Not implementing anything for {} due to no-resolve (probably the type isn't pub)", ident);
}
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();
}
writeln!(w, "}}\nuse {}::{} as {}Import;", types.module_path, e.ident, e.ident).unwrap();
write!(w, "pub(crate) type native{} = {}Import", e.ident, e.ident).unwrap();
- maybe_write_generics(w, &e.generics, &types, true);
+ maybe_write_generics(w, &e.generics, &syn::PathArguments::None, &types, true);
writeln!(w, ";\n\nimpl {} {{", e.ident).unwrap();
macro_rules! write_conv {
($fn_sig: expr, $to_c: expr, $ref: expr) => {
- writeln!(w, "\t#[allow(unused)]\n\tpub(crate) fn {} {{\n\t\tmatch {} {{", $fn_sig, if $to_c { "native" } else { "self" }).unwrap();
+ writeln!(w, "\t#[allow(unused)]\n\tpub(crate) fn {} {{", $fn_sig).unwrap();
+ if $to_c && $ref {
+ writeln!(w, "\t\tlet native = unsafe {{ &*(native as *const _ as *const c_void as *const native{}) }};", e.ident).unwrap();
+ }
+ writeln!(w, "\t\tmatch {} {{", if $to_c { "native" } else { "self" }).unwrap();
for var in e.variants.iter() {
write!(w, "\t\t\t{}{}::{} ", if $to_c { "native" } else { "" }, e.ident, var.ident).unwrap();
let mut empty_tuple_variant = false;
};
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 {
}
write_conv!(format!("into_native(self) -> native{}", e.ident), false, false);
if is_clonable {
- write_conv!(format!("from_native(native: &native{}) -> Self", e.ident), true, true);
+ let mut args = Vec::new();
+ maybe_write_non_lifetime_generics(&mut args, &e.generics, &syn::PathArguments::None, &types);
+ let fn_line = format!("from_native(native: &{}Import{}) -> Self", e.ident, String::from_utf8(args).unwrap());
+ write_conv!(fn_line, true, true);
}
write_conv!(format!("native_into(native: native{}) -> Self", e.ident), true, false);
writeln!(w, "}}").unwrap();
writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", e.ident, e.ident, e.ident).unwrap();
writeln!(w, "\torig.clone()").unwrap();
writeln!(w, "}}").unwrap();
+ 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 {}_clone_void(this_ptr: *const c_void) -> *mut c_void {{", e.ident).unwrap();
+ writeln!(w, "\tBox::into_raw(Box::new(unsafe {{ (*(this_ptr as *const {})).clone() }})) as *mut c_void", e.ident).unwrap();
+ writeln!(w, "}}").unwrap();
}
+
+ 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) {{", e.ident).unwrap();
+ writeln!(w, "\tlet _ = unsafe {{ Box::from_raw(this_ptr as *mut {}) }};\n}}", e.ident).unwrap();
+
w.write_all(&constr).unwrap();
write_cpp_wrapper(cpp_headers, &format!("{}", e.ident), needs_free, None);
}
write!(w, "{}::{}", types.module_path, f.sig.ident).unwrap();
let mut function_generic_args = Vec::new();
- maybe_write_generics(&mut function_generic_args, &f.sig.generics, types, true);
+ maybe_write_generics(&mut function_generic_args, &f.sig.generics, &syn::PathArguments::None, types, true);
if !function_generic_args.is_empty() {
write!(w, "::{}", String::from_utf8(function_generic_args).unwrap()).unwrap();
}
// *** File/Crate Walking Logic ***
// ********************************
-fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, libast: &'b FullLibraryAST, crate_types: &CrateTypes<'b>, out_dir: &str, mod_path: &str, module: &'b syn::ItemMod) {
+fn convert_priv_mod<'a, 'b: 'a, W: std::io::Write>(w: &mut W, w_uses: &mut HashSet<String, NonRandomHash>, libast: &'b FullLibraryAST, crate_types: &CrateTypes<'b>, out_dir: &str, mod_path: &str, module: &'b syn::ItemMod) {
// We want to ignore all items declared in this module (as they are not pub), but we still need
// to give the ImportResolver any use statements, so we copy them here.
let mut use_items = Vec::new();
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();
for item in module.content.as_ref().unwrap().1.iter() {
match item {
- syn::Item::Mod(m) => convert_priv_mod(w, libast, crate_types, out_dir, &format!("{}::{}", mod_path, module.ident), m),
+ syn::Item::Mod(m) => convert_priv_mod(w, w_uses, libast, crate_types, out_dir, &format!("{}::{}", mod_path, module.ident), m),
syn::Item::Impl(i) => {
- writeln_impl(w, i, &mut types);
+ writeln_impl(w, w_uses, i, &mut types);
},
_ => {},
}
let _ = std::fs::create_dir((&new_file_path.as_ref() as &std::path::Path).parent().unwrap());
let mut out = std::fs::OpenOptions::new().write(true).create(true).truncate(true)
.open(new_file_path).expect("Unable to open new src file");
+ let mut out_uses = HashSet::default();
writeln!(out, "// This file is Copyright its original authors, visible in version control").unwrap();
writeln!(out, "// history and in the source files from which this was generated.").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() {
}
},
syn::Item::Impl(i) => {
- writeln_impl(&mut out, &i, &mut type_resolver);
+ writeln_impl(&mut out, &mut out_uses, &i, &mut type_resolver);
},
syn::Item::Struct(s) => {
if let syn::Visibility::Public(_) = s.vis {
}
},
syn::Item::Mod(m) => {
- convert_priv_mod(&mut out, libast, crate_types, out_dir, &format!("{}::{}", module, m.ident), m);
+ convert_priv_mod(&mut out, &mut out_uses, libast, crate_types, out_dir, &format!("{}::{}", module, m.ident), m);
},
syn::Item::Const(c) => {
// Re-export any primitive-type constants.
}
}
+ for use_stmt in out_uses {
+ writeln!(out, "{}", use_stmt).unwrap();
+ }
+
out.flush().unwrap();
}
}
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),
if let Some(trait_path) = i.trait_.as_ref() {
if let Some(tp) = import_resolver.maybe_resolve_path(&trait_path.1, None) {
if let Some(sp) = import_resolver.maybe_resolve_path(&p.path, None) {
- match crate_types.trait_impls.entry(sp) {
- hash_map::Entry::Occupied(mut e) => { e.get_mut().push(tp); },
- hash_map::Entry::Vacant(e) => { e.insert(vec![tp]); },
+ match crate_types.trait_impls.entry(sp.clone()) {
+ hash_map::Entry::Occupied(mut e) => { e.get_mut().push(tp.clone()); },
+ hash_map::Entry::Vacant(e) => { e.insert(vec![tp.clone()]); },
+ }
+ match crate_types.traits_impld.entry(tp) {
+ hash_map::Entry::Occupied(mut e) => { e.get_mut().push(sp); },
+ hash_map::Entry::Vacant(e) => { e.insert(vec![sp]); },
}
}
}
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 {
}
let trait_path = format!("{}::{}", module, t.ident);
walk_supertraits!(t, None, (
- ("Clone", _) => {
+ ("Clone", _, _) => {
crate_types.set_clonable("crate::".to_owned() + &trait_path);
},
- (_, _) => {}
+ (_, _, _) => {}
) );
crate_types.traits.insert(trait_path, &t);
}
}
if let Some(tp) = import_resolver.maybe_resolve_path(&trait_path.1, None) {
if let Some(sp) = import_resolver.maybe_resolve_path(&p.path, None) {
- match crate_types.trait_impls.entry(sp) {
- hash_map::Entry::Occupied(mut e) => { e.get_mut().push(tp); },
- hash_map::Entry::Vacant(e) => { e.insert(vec![tp]); },
+ match crate_types.trait_impls.entry(sp.clone()) {
+ hash_map::Entry::Occupied(mut e) => { e.get_mut().push(tp.clone()); },
+ hash_map::Entry::Vacant(e) => { e.insert(vec![tp.clone()]); },
+ }
+ match crate_types.traits_impld.entry(tp) {
+ hash_map::Entry::Occupied(mut e) => { e.get_mut().push(sp); },
+ hash_map::Entry::Vacant(e) => { e.insert(vec![sp]); },
}
}
}
projects / ldk-c-bindings / blobdiff