//! 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};
},
"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);
write!(w, "\tlet res: ").unwrap();
// At least in one case we need type annotations here, so provide them.
- types.write_rust_type(w, Some(generics), &res_ty);
+ types.write_rust_type(w, Some(generics), &res_ty, false);
if t == "lightning::util::ser::ReadableArgs" {
writeln!(w, " = crate::c_types::deserialize_obj_arg(ser, arg_conv);").unwrap();
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() {
}
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);
}
// 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() {
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
}
_ => panic!("5"),
}
- $type_resolver.write_rust_type(w, Some(&gen_types), &*arg.ty);
+ $type_resolver.write_rust_type(w, Some(&gen_types), &*arg.ty, false);
}
}
}
match &m.sig.output {
syn::ReturnType::Type(_, rtype) => {
write!(w, " -> ").unwrap();
- $type_resolver.write_rust_type(w, Some(&gen_types), &*rtype)
+ $type_resolver.write_rust_type(w, Some(&gen_types), &*rtype, false)
},
_ => {},
}
// 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);
write!(w, "impl").unwrap();
maybe_write_lifetime_generics(w, &supertrait.generics, types);
write!(w, " {}", s).unwrap();
- maybe_write_generics(w, &supertrait.generics, types, false);
+ maybe_write_generics(w, &supertrait.generics, generic_args, types, false);
writeln!(w, " for {} {{", trait_name).unwrap();
- impl_trait_for_c!(supertrait, format!(".{}", i), &resolver);
+ impl_trait_for_c!(supertrait, format!(".{}", i), &resolver, generic_args);
writeln!(w, "}}").unwrap();
} 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();
// 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();
+ }
+ }
}
}
/// 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,
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);
// 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_libs, 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();
}
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", _, _) => {},
+ (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();
_ => {}
}
}
- 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 {
if idx != 0 { t_gen_args += ", " };
t_gen_args += "_"
}
+ // rustc doesn't like <_> if the _ is actually a lifetime, so
+ // if all the parameters are lifetimes just skip it.
+ let mut nonlifetime_param = false;
+ for param in $trait.generics.params.iter() {
+ if let syn::GenericParam::Lifetime(_) = param {}
+ else { nonlifetime_param = true; }
+ }
+ if !nonlifetime_param { t_gen_args = String::new(); }
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();
} else {
},
_ => {},
}
- 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 {
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, "\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) => {
+ (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();
}
}
} else if let Some(resolved_path) = types.maybe_resolve_ident(&ident) {
- if let Some(aliases) = types.crate_types.reverse_alias_map.get(&resolved_path).cloned() {
- let mut gen_types = Some(GenericTypes::new(Some(resolved_path.clone())));
- if !gen_types.as_mut().unwrap().learn_generics(&i.generics, types) {
- gen_types = None;
- }
- let alias_module = rsplit_once(&resolved_path, "::").unwrap().0;
-
- 'alias_impls: for (alias_resolved, arguments) in aliases {
- let mut new_ty_generics = Vec::new();
- let mut new_ty_bounds = Vec::new();
- let mut need_generics = false;
-
- 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_module, &types.crate_types.lib_ast.modules.get(alias_module).unwrap().items);
- &alias_resolver_override
- } else { &types.types };/*.maybe_resolve_path(&alias, None).unwrap();*/
- let mut where_clause = Some(syn::WhereClause {
- where_token: syn::Token),
- predicates: syn::punctuated::Punctuated::new()
- });
- for (idx, gen) in i.generics.params.iter().enumerate() {
- match gen {
- syn::GenericParam::Type(type_param) => {
- 'bounds_check: for bound in type_param.bounds.iter() {
- if let syn::TypeParamBound::Trait(trait_bound) = bound {
- if let syn::PathArguments::AngleBracketed(ref t) = &arguments {
- assert!(idx < t.args.len());
- if let syn::GenericArgument::Type(syn::Type::Path(p)) = &t.args[idx] {
- let generic_bound = types.maybe_resolve_path(&trait_bound.path, None)
- .unwrap_or_else(|| format!("{}::{}", types.module_path, single_ident_generic_path_to_ident(&trait_bound.path).unwrap()));
-
- if let Some(generic_arg) = alias_resolver.maybe_resolve_path(&p.path, None) {
- new_ty_generics.push((type_param.ident.clone(), syn::Type::Path(p.clone())));
- if let Some(traits_impld) = types.crate_types.trait_impls.get(&generic_arg) {
- for trait_impld in traits_impld {
- if *trait_impld == generic_bound { continue 'bounds_check; }
- }
- eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
- continue 'alias_impls;
- } else {
- eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
- continue 'alias_impls;
- }
- } else if gen_types.is_some() {
- let resp = types.maybe_resolve_path(&p.path, gen_types.as_ref());
- if generic_bound == "core::ops::Deref" && resp.is_some() {
- new_ty_bounds.push((type_param.ident.clone(),
- string_path_to_syn_path("core::ops::Deref")));
- let mut bounds = syn::punctuated::Punctuated::new();
- bounds.push(syn::TypeParamBound::Trait(syn::TraitBound {
- paren_token: None,
- modifier: syn::TraitBoundModifier::None,
- lifetimes: None,
- path: string_path_to_syn_path(&types.resolve_path(&p.path, gen_types.as_ref())),
- }));
- let mut path = string_path_to_syn_path(&format!("{}::Target", type_param.ident));
- path.leading_colon = None;
- where_clause.as_mut().unwrap().predicates.push(syn::WherePredicate::Type(syn::PredicateType {
- lifetimes: None,
- bounded_ty: syn::Type::Path(syn::TypePath { qself: None, path }),
- colon_token: syn::Token),
- bounds,
- }));
- } else {
- new_ty_generics.push((type_param.ident.clone(),
- gen_types.as_ref().resolve_type(&syn::Type::Path(p.clone())).clone()));
- }
- need_generics = true;
- } else {
- unimplemented!();
- }
- } else { unimplemented!(); }
- } else { unimplemented!(); }
- } else { unimplemented!(); }
- }
- },
- syn::GenericParam::Lifetime(_) => {},
- syn::GenericParam::Const(_) => unimplemented!(),
- }
- }
- let mut params = syn::punctuated::Punctuated::new();
- let alias = string_path_to_syn_path(&alias_resolved);
- let real_aliased =
- if need_generics {
- let alias_generics = types.crate_types.opaques.get(&alias_resolved).unwrap().1;
-
- // If we need generics on the alias, create impl generic bounds...
- assert_eq!(new_ty_generics.len() + new_ty_bounds.len(), i.generics.params.len());
- let mut args = syn::punctuated::Punctuated::new();
- for (ident, param) in new_ty_generics.drain(..) {
- // TODO: We blindly assume that generics in the type alias and
- // the aliased type have the same names, which we really shouldn't.
- if alias_generics.params.iter().any(|generic|
- if let syn::GenericParam::Type(t) = generic { t.ident == ident } else { false })
- {
- args.push(parse_quote!(#ident));
- }
- params.push(syn::GenericParam::Type(syn::TypeParam {
- attrs: Vec::new(),
- ident,
- colon_token: None,
- bounds: syn::punctuated::Punctuated::new(),
- eq_token: Some(syn::token::Eq(Span::call_site())),
- default: Some(param),
- }));
- }
- for (ident, param) in new_ty_bounds.drain(..) {
- // TODO: We blindly assume that generics in the type alias and
- // the aliased type have the same names, which we really shouldn't.
- if alias_generics.params.iter().any(|generic|
- if let syn::GenericParam::Type(t) = generic { t.ident == ident } else { false })
- {
- args.push(parse_quote!(#ident));
- }
- params.push(syn::GenericParam::Type(syn::TypeParam {
- attrs: Vec::new(),
- ident,
- colon_token: Some(syn::token::Colon(Span::call_site())),
- bounds: syn::punctuated::Punctuated::from_iter(
- Some(syn::TypeParamBound::Trait(syn::TraitBound {
- path: param, paren_token: None, lifetimes: None,
- modifier: syn::TraitBoundModifier::None,
- }))
- ),
- eq_token: None,
- default: None,
- }));
- }
- // ... and swap the last segment of the impl self_ty to use the generic bounds.
- let mut res = alias.clone();
- res.segments.last_mut().unwrap().arguments = syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
- colon2_token: None,
- lt_token: syn::token::Lt(Span::call_site()),
- args,
- gt_token: syn::token::Gt(Span::call_site()),
- });
- res
- } else { alias.clone() };
- let aliased_impl = syn::ItemImpl {
- attrs: i.attrs.clone(),
- brace_token: syn::token::Brace(Span::call_site()),
- defaultness: None,
- generics: syn::Generics {
- lt_token: None,
- params,
- gt_token: None,
- where_clause,
- },
- impl_token: syn::Token),
- items: i.items.clone(),
- self_ty: Box::new(syn::Type::Path(syn::TypePath { qself: None, path: real_aliased })),
- trait_: i.trait_.clone(),
- unsafety: None,
- };
- writeln_impl(w, &aliased_impl, types);
- }
- } else {
- eprintln!("Not implementing anything for {} due to it being marked not exported", ident);
- }
+ 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);
}
}
}
+fn create_alias_for_impl<F: FnMut(syn::ItemImpl, &mut TypeResolver)>(resolved_path: String, i: &syn::ItemImpl, types: &mut TypeResolver, mut callback: F) {
+ if let Some(aliases) = types.crate_types.reverse_alias_map.get(&resolved_path).cloned() {
+ let mut gen_types = Some(GenericTypes::new(Some(resolved_path.clone())));
+ if !gen_types.as_mut().unwrap().learn_generics(&i.generics, types) {
+ gen_types = None;
+ }
+ let alias_module = rsplit_once(&resolved_path, "::").unwrap().0;
+
+ 'alias_impls: for (alias_resolved, arguments) in aliases {
+ let mut new_ty_generics = Vec::new();
+ let mut new_ty_bounds = Vec::new();
+ let mut need_generics = false;
+
+ 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_module, &types.crate_types.lib_ast.modules.get(alias_module).unwrap().items);
+ &alias_resolver_override
+ } else { &types.types };
+ let mut where_clause = syn::WhereClause { where_token: syn::Token),
+ predicates: syn::punctuated::Punctuated::new()
+ };
+ for (idx, gen) in i.generics.params.iter().enumerate() {
+ match gen {
+ syn::GenericParam::Type(type_param) => {
+ 'bounds_check: for bound in type_param.bounds.iter() {
+ if let syn::TypeParamBound::Trait(trait_bound) = bound {
+ if let syn::PathArguments::AngleBracketed(ref t) = &arguments {
+ assert!(idx < t.args.len());
+ if let syn::GenericArgument::Type(syn::Type::Path(p)) = &t.args[idx] {
+ let generic_bound = types.maybe_resolve_path(&trait_bound.path, None)
+ .unwrap_or_else(|| format!("{}::{}", types.module_path, single_ident_generic_path_to_ident(&trait_bound.path).unwrap()));
+
+ if let Some(generic_arg) = alias_resolver.maybe_resolve_path(&p.path, None) {
+ new_ty_generics.push((type_param.ident.clone(), syn::Type::Path(p.clone())));
+ if let Some(traits_impld) = types.crate_types.trait_impls.get(&generic_arg) {
+ for trait_impld in traits_impld {
+ if *trait_impld == generic_bound { continue 'bounds_check; }
+ }
+ eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
+ continue 'alias_impls;
+ } else {
+ eprintln!("struct {}'s generic arg {} didn't match bound {}", alias_resolved, generic_arg, generic_bound);
+ continue 'alias_impls;
+ }
+ } else if gen_types.is_some() {
+ let resp = types.maybe_resolve_path(&p.path, gen_types.as_ref());
+ if generic_bound == "core::ops::Deref" && resp.is_some() {
+ new_ty_bounds.push((type_param.ident.clone(),
+ string_path_to_syn_path("core::ops::Deref")));
+ let mut bounds = syn::punctuated::Punctuated::new();
+ bounds.push(syn::TypeParamBound::Trait(syn::TraitBound {
+ paren_token: None,
+ modifier: syn::TraitBoundModifier::None,
+ lifetimes: None,
+ path: string_path_to_syn_path(&types.resolve_path(&p.path, gen_types.as_ref())),
+ }));
+ let mut path = string_path_to_syn_path(&format!("{}::Target", type_param.ident));
+ path.leading_colon = None;
+ where_clause.predicates.push(syn::WherePredicate::Type(syn::PredicateType {
+ lifetimes: None,
+ bounded_ty: syn::Type::Path(syn::TypePath { qself: None, path }),
+ colon_token: syn::Token),
+ bounds,
+ }));
+ } else {
+ new_ty_generics.push((type_param.ident.clone(),
+ gen_types.as_ref().resolve_type(&syn::Type::Path(p.clone())).clone()));
+ }
+ need_generics = true;
+ } else {
+ unimplemented!();
+ }
+ } else { unimplemented!(); }
+ } else { unimplemented!(); }
+ } else { unimplemented!(); }
+ }
+ },
+ syn::GenericParam::Lifetime(_) => {},
+ syn::GenericParam::Const(_) => unimplemented!(),
+ }
+ }
+ let mut params = syn::punctuated::Punctuated::new();
+ let alias = string_path_to_syn_path(&alias_resolved);
+ let real_aliased =
+ if need_generics {
+ let alias_generics = types.crate_types.opaques.get(&alias_resolved).unwrap().1;
+
+ // If we need generics on the alias, create impl generic bounds...
+ assert_eq!(new_ty_generics.len() + new_ty_bounds.len(), i.generics.params.len());
+ let mut args = syn::punctuated::Punctuated::new();
+ for (ident, param) in new_ty_generics.drain(..) {
+ // TODO: We blindly assume that generics in the type alias and
+ // the aliased type have the same names, which we really shouldn't.
+ if alias_generics.params.iter().any(|generic|
+ if let syn::GenericParam::Type(t) = generic { t.ident == ident } else { false })
+ {
+ args.push(parse_quote!(#ident));
+ }
+ params.push(syn::GenericParam::Type(syn::TypeParam {
+ attrs: Vec::new(),
+ ident,
+ colon_token: None,
+ bounds: syn::punctuated::Punctuated::new(),
+ eq_token: Some(syn::token::Eq(Span::call_site())),
+ default: Some(param),
+ }));
+ }
+ for (ident, param) in new_ty_bounds.drain(..) {
+ // TODO: We blindly assume that generics in the type alias and
+ // the aliased type have the same names, which we really shouldn't.
+ if alias_generics.params.iter().any(|generic|
+ if let syn::GenericParam::Type(t) = generic { t.ident == ident } else { false })
+ {
+ args.push(parse_quote!(#ident));
+ }
+ params.push(syn::GenericParam::Type(syn::TypeParam {
+ attrs: Vec::new(),
+ ident,
+ colon_token: Some(syn::token::Colon(Span::call_site())),
+ bounds: syn::punctuated::Punctuated::from_iter(
+ Some(syn::TypeParamBound::Trait(syn::TraitBound {
+ path: param, paren_token: None, lifetimes: None,
+ modifier: syn::TraitBoundModifier::None,
+ }))
+ ),
+ eq_token: None,
+ default: None,
+ }));
+ }
+ // ... and swap the last segment of the impl self_ty to use the generic bounds.
+ let mut res = alias.clone();
+ res.segments.last_mut().unwrap().arguments = syn::PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+ colon2_token: None,
+ lt_token: syn::token::Lt(Span::call_site()),
+ args,
+ gt_token: syn::token::Gt(Span::call_site()),
+ });
+ res
+ } else { alias.clone() };
+ callback(syn::ItemImpl {
+ attrs: i.attrs.clone(),
+ brace_token: syn::token::Brace(Span::call_site()),
+ defaultness: None,
+ generics: syn::Generics {
+ lt_token: None,
+ params,
+ gt_token: None,
+ where_clause: Some(where_clause),
+ },
+ impl_token: syn::Token),
+ items: i.items.clone(),
+ self_ty: Box::new(syn::Type::Path(syn::TypePath { qself: None, path: real_aliased })),
+ trait_: i.trait_.clone(),
+ unsafety: None,
+ }, types);
+ }
+ } else {
+ eprintln!("Not implementing anything for {} due to it being marked not exported", resolved_path);
+ }
+}
+
/// Replaces upper case charachters with underscore followed by lower case except the first
/// charachter and repeated upper case characthers (which are only made lower case).
fn camel_to_snake_case(camel: &str) -> String {
let mut needs_free = false;
let mut constr = Vec::new();
+ let mut is_clonable = true;
+
+ for var in e.variants.iter() {
+ if let syn::Fields::Named(fields) = &var.fields {
+ needs_free = true;
+ for field in fields.named.iter() {
+ if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
- writeln!(w, "#[must_use]\n#[derive(Clone)]\n#[repr(C)]\npub enum {} {{", e.ident).unwrap();
+ let mut ty_checks = Vec::new();
+ types.write_c_type(&mut ty_checks, &field.ty, Some(&gen_types), false);
+ if !types.is_clonable(&String::from_utf8(ty_checks).unwrap()) {
+ is_clonable = false;
+ }
+ }
+ } else if let syn::Fields::Unnamed(fields) = &var.fields {
+ for field in fields.unnamed.iter() {
+ let mut ty_checks = Vec::new();
+ types.write_c_type(&mut ty_checks, &field.ty, Some(&gen_types), false);
+ let ty = String::from_utf8(ty_checks).unwrap();
+ if ty != "" && !types.is_clonable(&ty) {
+ is_clonable = false;
+ }
+ }
+ }
+ }
+
+ if is_clonable {
+ writeln!(w, "#[derive(Clone)]").unwrap();
+ types.crate_types.set_clonable(format!("{}::{}", types.module_path, e.ident));
+ }
+ writeln!(w, "#[must_use]\n#[repr(C)]\npub enum {} {{", e.ident).unwrap();
for var in e.variants.iter() {
assert_eq!(export_status(&var.attrs), ExportStatus::Export); // We can't partially-export a mirrored enum
writeln_docs(w, &var.attrs, "\t");
}
if !empty_tuple_variant {
needs_free = true;
- write!(w, "(").unwrap();
+ writeln!(w, "(").unwrap();
for (idx, field) in fields.unnamed.iter().enumerate() {
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
- write!(&mut constr, "{}: ", ('a' as u8 + idx as u8) as char).unwrap();
+ writeln_field_docs(w, &field.attrs, "\t\t", types, Some(&gen_types), &field.ty);
+ write!(w, "\t\t").unwrap();
types.write_c_type(w, &field.ty, Some(&gen_types), true);
+
+ write!(&mut constr, "{}: ", ('a' as u8 + idx as u8) as char).unwrap();
types.write_c_type(&mut constr, &field.ty, Some(&gen_types), false);
if idx != fields.unnamed.len() - 1 {
- write!(w, ",").unwrap();
+ writeln!(w, ",").unwrap();
write!(&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 {
}
}
- write_conv!(format!("to_native(&self) -> native{}", e.ident), false, true);
+ if is_clonable {
+ write_conv!(format!("to_native(&self) -> native{}", e.ident), false, true);
+ }
write_conv!(format!("into_native(self) -> native{}", e.ident), false, false);
- write_conv!(format!("from_native(native: &native{}) -> Self", e.ident), true, true);
+ if is_clonable {
+ write_conv!(format!("from_native(native: &native{}) -> Self", e.ident), true, true);
+ }
write_conv!(format!("native_into(native: native{}) -> Self", e.ident), true, false);
writeln!(w, "}}").unwrap();
writeln!(w, "/// Frees any resources used by the {}", e.ident).unwrap();
writeln!(w, "#[no_mangle]\npub extern \"C\" fn {}_free(this_ptr: {}) {{ }}", e.ident, e.ident).unwrap();
}
- writeln!(w, "/// Creates a copy of the {}", e.ident).unwrap();
- writeln!(w, "#[no_mangle]").unwrap();
- writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", e.ident, e.ident, e.ident).unwrap();
- writeln!(w, "\torig.clone()").unwrap();
- writeln!(w, "}}").unwrap();
+ if is_clonable {
+ writeln!(w, "/// Creates a copy of the {}", e.ident).unwrap();
+ writeln!(w, "#[no_mangle]").unwrap();
+ writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", e.ident, e.ident, e.ident).unwrap();
+ writeln!(w, "\torig.clone()").unwrap();
+ writeln!(w, "}}").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();
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();
}
},
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();
}
}
+
+/// Walk the FullLibraryAST, determining if impl aliases need to be marked cloneable.
+fn walk_ast_second_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &CrateTypes<'a>) {
+ for (module, astmod) in ast_storage.modules.iter() {
+ let orig_crate = module.splitn(2, "::").next().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 mut types = TypeResolver::new(module, import_resolver, crate_types);
+
+ for item in items.iter() {
+ match item {
+ syn::Item::Impl(i) => {
+ match export_status(&i.attrs) {
+ ExportStatus::Export => {},
+ ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+ ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
+ }
+ if let Some(trait_path) = i.trait_.as_ref() {
+ if path_matches_nongeneric(&trait_path.1, &["core", "clone", "Clone"]) ||
+ path_matches_nongeneric(&trait_path.1, &["Clone"])
+ {
+ if let &syn::Type::Path(ref p) = &*i.self_ty {
+ if let Some(resolved_path) = types.maybe_resolve_path(&p.path, None) {
+ create_alias_for_impl(resolved_path, i, &mut types, |aliased_impl, types| {
+ if let &syn::Type::Path(ref p) = &*aliased_impl.self_ty {
+ if let Some(resolved_aliased_path) = types.maybe_resolve_path(&p.path, None) {
+ crate_types.set_clonable("crate::".to_owned() + &resolved_aliased_path);
+ }
+ }
+ });
+ }
+ }
+ }
+ }
+ }
+ _ => {}
+ }
+ }
+ }
+}
+
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);
for item in items.content.as_ref().unwrap().1.iter() {
}
/// Walk the FullLibraryAST, deciding how things will be mapped and adding tracking to CrateTypes.
-fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a>) {
+fn walk_ast_first_pass<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a>) {
for (module, astmod) in ast_storage.modules.iter() {
let ASTModule { ref attrs, ref items, submods: _ } = astmod;
assert_eq!(export_status(&attrs), ExportStatus::Export);
}
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);
}
// ...then walk the ASTs tracking what types we will map, and how, so that we can resolve them
// when parsing other file ASTs...
let mut libtypes = CrateTypes::new(&mut derived_templates, &libast);
- walk_ast(&libast, &mut libtypes);
+ walk_ast_first_pass(&libast, &mut libtypes);
+
+ // ... using the generated data, determine a few additional fields, specifically which type
+ // aliases are to be clone-able...
+ walk_ast_second_pass(&libast, &libtypes);
// ... finally, do the actual file conversion/mapping, writing out types as we go.
convert_file(&libast, &libtypes, &args[1], &mut header_file, &mut cpp_header_file);
projects / ldk-c-bindings / blobdiff