X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=8bbbdf03765579e5636c49aa3dfd9e937cee8768;hp=94d25e8bba03d77497ac199ebf41a03b4402a06c;hb=4e514def04a4aabea8261173311e6c747d4bd133;hpb=42f443826a74246e49d8fbbd2590c061ca8308be

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index 94d25e8..8bbbdf0 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -221,8 +221,10 @@ macro_rules! walk_supertraits { ($t: expr, $types: expr, ($( $($pat: pat)|* => $
 /// a concrete Deref to the Rust trait.
 fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, types: &mut TypeResolver<'b, 'a>, extra_headers: &mut File, cpp_headers: &mut File) {
 	let trait_name = format!("{}", t.ident);
+	let implementable;
 	match export_status(&t.attrs) {
-		ExportStatus::Export => {},
+		ExportStatus::Export => { implementable = true; }
+		ExportStatus::NotImplementable => { implementable = false; },
 		ExportStatus::NoExport|ExportStatus::TestOnly => return,
 	}
 	writeln_docs(w, &t.attrs, "");
@@ -247,6 +249,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 					},
 					ExportStatus::Export => {},
 					ExportStatus::TestOnly => continue,
+					ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 				}
 				if m.default.is_some() { unimplemented!(); }
 
@@ -447,11 +450,11 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 		}
 	}
 
+	writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap();
+	writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap();
 
 	// Implement supertraits for the C-mapped struct.
 	walk_supertraits!(t, Some(&types), (
-		("Send", _) => writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap(),
-		("Sync", _) => writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap(),
 		("std::cmp::Eq", _)|("core::cmp::Eq", _) => {
 			writeln!(w, "impl std::cmp::Eq for {} {{}}", trait_name).unwrap();
 			writeln!(w, "impl std::cmp::PartialEq for {} {{", trait_name).unwrap();
@@ -461,6 +464,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 			writeln!(w, "impl std::hash::Hash for {} {{", trait_name).unwrap();
 			writeln!(w, "\tfn hash<H: std::hash::Hasher>(&self, hasher: &mut H) {{ hasher.write_u64((self.hash)(self.this_arg)) }}\n}}").unwrap();
 		},
+		("Send", _) => {}, ("Sync", _) => {},
 		("Clone", _) => {
 			writeln!(w, "#[no_mangle]").unwrap();
 			writeln!(w, "/// Creates a copy of a {}", trait_name).unwrap();
@@ -492,11 +496,6 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 				writeln!(w, "impl {} for {} {{", s, trait_name).unwrap();
 				impl_trait_for_c!(supertrait, format!(".{}", i), &resolver);
 				writeln!(w, "}}").unwrap();
-				walk_supertraits!(supertrait, Some(&types), (
-					("Send", _) => writeln!(w, "unsafe impl Send for {} {{}}", trait_name).unwrap(),
-					("Sync", _) => writeln!(w, "unsafe impl Sync for {} {{}}", trait_name).unwrap(),
-					_ => unimplemented!()
-				) );
 			} else {
 				do_write_impl_trait(w, s, i, &trait_name);
 			}
@@ -505,15 +504,17 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 
 	// Finally, implement the original Rust trait for the newly created mapped trait.
 	writeln!(w, "\nuse {}::{} as rust{};", types.module_path, t.ident, trait_name).unwrap();
-	write!(w, "impl rust{}", t.ident).unwrap();
-	maybe_write_generics(w, &t.generics, types, false);
-	writeln!(w, " for {} {{", trait_name).unwrap();
-	impl_trait_for_c!(t, "", types);
-	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 std::ops::Deref for {} {{\n\ttype Target = Self;", trait_name).unwrap();
-	writeln!(w, "\tfn deref(&self) -> &Self {{\n\t\tself\n\t}}\n}}").unwrap();
+	if implementable {
+		write!(w, "impl rust{}", t.ident).unwrap();
+		maybe_write_generics(w, &t.generics, types, false);
+		writeln!(w, " for {} {{", trait_name).unwrap();
+		impl_trait_for_c!(t, "", types);
+		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 std::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, "/// Calls the free function if one is set").unwrap();
 	writeln!(w, "#[no_mangle]\npub extern \"C\" fn {}_free(this_ptr: {}) {{ }}", trait_name, trait_name).unwrap();
@@ -597,6 +598,7 @@ fn writeln_struct<'a, 'b, W: std::io::Write>(w: &mut W, s: &'a syn::ItemStruct,
 						all_fields_settable = false;
 						continue
 					},
+					ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 				}
 
 				if let Some(ident) = &field.ident {
@@ -675,6 +677,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 	match export_status(&i.attrs) {
 		ExportStatus::Export => {},
 		ExportStatus::NoExport|ExportStatus::TestOnly => return,
+		ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 	}
 
 	if let syn::Type::Tuple(_) = &*i.self_ty {
@@ -739,7 +742,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 
 						let export = export_status(&trait_obj.attrs);
 						match export {
-							ExportStatus::Export => {},
+							ExportStatus::Export|ExportStatus::NotImplementable => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => return,
 						}
 
@@ -776,6 +779,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 										continue;
 									},
 									ExportStatus::TestOnly => continue,
+									ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 								}
 
 								let mut printed = false;
@@ -843,6 +847,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 								match export_status(&trait_method.attrs) {
 									ExportStatus::Export => {},
 									ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+									ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 								}
 
 								if let syn::ReturnType::Type(_, _) = &$m.sig.output {
@@ -940,6 +945,52 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 						write!(w, "\t{} {{ inner: Box::into_raw(Box::new(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"]) {
+						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) {
+							writeln!(w, "/// Two objects with NULL inner values will be considered \"equal\" here.").unwrap();
+						}
+						write!(w, "#[no_mangle]\npub extern \"C\" fn {}_eq(a: &{}, b: &{}) -> bool {{\n", ident, ident, ident).unwrap();
+						if types.c_type_has_inner_from_path(&resolved_path) {
+							write!(w, "\tif a.inner == b.inner {{ return true; }}\n").unwrap();
+							write!(w, "\tif a.inner.is_null() || b.inner.is_null() {{ return false; }}\n").unwrap();
+						}
+
+						let path = &p.path;
+						let ref_type: syn::Type = syn::parse_quote!(&#path);
+						assert!(!types.write_to_c_conversion_new_var(w, &format_ident!("a"), &*i.self_ty, Some(&gen_types), false), "We don't support new var conversions when comparing equality");
+
+						write!(w, "\tif ").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "a").unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+						write!(w, " == ").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "b").unwrap();
+						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();
+						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();
+						}
+
+						let path = &p.path;
+						let ref_type: syn::Type = syn::parse_quote!(&#path);
+						assert!(!types.write_to_c_conversion_new_var(w, &format_ident!("a"), &*i.self_ty, Some(&gen_types), false), "We don't support new var conversions when comparing equality");
+
+						writeln!(w, "\t// Note that we'd love to use std::collections::hash_map::DefaultHasher but it's not in core").unwrap();
+						writeln!(w, "\t#[allow(deprecated)]").unwrap();
+						writeln!(w, "\tlet mut hasher = core::hash::SipHasher::new();").unwrap();
+						write!(w, "\tstd::hash::Hash::hash(").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "o").unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+						writeln!(w, ", &mut hasher);").unwrap();
+						writeln!(w, "\tstd::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) {
 						writeln!(w, "impl Clone for {} {{", ident).unwrap();
@@ -1006,6 +1057,7 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 									match export_status(&m.attrs) {
 										ExportStatus::Export => {},
 										ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+										ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 									}
 									if m.defaultness.is_some() { unimplemented!(); }
 									writeln_docs(w, &m.attrs, "");
@@ -1128,6 +1180,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 	match export_status(&e.attrs) {
 		ExportStatus::Export => {},
 		ExportStatus::NoExport|ExportStatus::TestOnly => return,
+		ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 	}
 
 	if is_enum_opaque(e) {
@@ -1328,6 +1381,7 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: &
 	match export_status(&f.attrs) {
 		ExportStatus::Export => {},
 		ExportStatus::NoExport|ExportStatus::TestOnly => return,
+		ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 	}
 	writeln_docs(w, &f.attrs, "");
 
@@ -1481,6 +1535,7 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a>
 						match export_status(&t.attrs) {
 							ExportStatus::Export => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+							ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 						}
 
 						let mut process_alias = true;
@@ -1552,6 +1607,7 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 						match export_status(&s.attrs) {
 							ExportStatus::Export => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+							ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 						}
 						let struct_path = format!("{}::{}", module, s.ident);
 						crate_types.opaques.insert(struct_path, &s.ident);
@@ -1560,7 +1616,7 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 				syn::Item::Trait(t) => {
 					if let syn::Visibility::Public(_) = t.vis {
 						match export_status(&t.attrs) {
-							ExportStatus::Export => {},
+							ExportStatus::Export|ExportStatus::NotImplementable => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
 						}
 						let trait_path = format!("{}::{}", module, t.ident);
@@ -1578,6 +1634,7 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 						match export_status(&t.attrs) {
 							ExportStatus::Export => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+							ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 						}
 						let type_path = format!("{}::{}", module, t.ident);
 						let mut process_alias = true;
@@ -1612,6 +1669,7 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 						match export_status(&e.attrs) {
 							ExportStatus::Export => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+							ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 						}
 						let enum_path = format!("{}::{}", module, e.ident);
 						crate_types.opaques.insert(enum_path, &e.ident);
@@ -1622,6 +1680,7 @@ fn walk_ast<'a>(ast_storage: &'a FullLibraryAST, crate_types: &mut CrateTypes<'a
 						match export_status(&e.attrs) {
 							ExportStatus::Export => {},
 							ExportStatus::NoExport|ExportStatus::TestOnly => continue,
+							ExportStatus::NotImplementable => panic!("(C-not implementable) must only appear on traits"),
 						}
 						let enum_path = format!("{}::{}", module, e.ident);
 						crate_types.mirrored_enums.insert(enum_path, &e);