X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=a0acfc65dd6a27cc9e30a0f0167210526ca434bd;hb=c42ea50cc703f03465d52b5fccfc4a90466d9fea;hp=a93122daf83151b4413afa12be7e9378c2b181a4;hpb=a387badfe87b6fa1c2f8f0ea488723c1fd5aa3e0;p=rust-lightning

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index a93122da..a0acfc65 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -536,7 +536,7 @@ fn writeln_opaque<W: std::io::Write>(w: &mut W, ident: &syn::Ident, struct_name:
 	writeln!(w, "\t/// the Rust equivalent takes an Option, it may be set to null to indicate None.").unwrap();
 	writeln!(w, "\tpub inner: *mut native{},\n\tpub is_owned: bool,\n}}\n", ident).unwrap();
 	writeln!(w, "impl Drop for {} {{\n\tfn drop(&mut self) {{", struct_name).unwrap();
-	writeln!(w, "\t\tif self.is_owned && !self.inner.is_null() {{").unwrap();
+	writeln!(w, "\t\tif self.is_owned && !<*mut native{}>::is_null(self.inner) {{", ident).unwrap();
 	writeln!(w, "\t\t\tlet _ = unsafe {{ Box::from_raw(self.inner) }};\n\t\t}}\n\t}}\n}}").unwrap();
 	writeln!(w, "#[no_mangle]\npub extern \"C\" fn {}_free(this_ptr: {}) {{ }}", struct_name, struct_name).unwrap();
 	writeln!(w, "#[allow(unused)]").unwrap();
@@ -808,10 +808,10 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 								}
 							}
 						) );
-						write!(w, "\t}}\n}}\nuse {}::{} as {}TraitImport;\n", types.orig_crate, full_trait_path, trait_obj.ident).unwrap();
+						writeln!(w, "\t}}\n}}\n").unwrap();
 
 						macro_rules! impl_meth {
-							($m: expr, $trait: expr, $indent: expr) => {
+							($m: expr, $trait_path: expr, $trait: expr, $indent: expr) => {
 								let trait_method = $trait.items.iter().filter_map(|item| {
 									if let syn::TraitItem::Method(t_m) = item { Some(t_m) } else { None }
 								}).find(|trait_meth| trait_meth.sig.ident == $m.sig.ident).unwrap();
@@ -835,10 +835,16 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 										takes_self = true;
 									}
 								}
+
+								let mut t_gen_args = String::new();
+								for (idx, _) in $trait.generics.params.iter().enumerate() {
+									if idx != 0 { t_gen_args += ", " };
+									t_gen_args += "_"
+								}
 								if takes_self {
-									write!(w, "unsafe {{ &mut *(this_arg as *mut native{}) }}.{}(", ident, $m.sig.ident).unwrap();
+									write!(w, "<native{} as {}::{}<{}>>::{}(unsafe {{ &mut *(this_arg as *mut native{}) }}, ", ident, types.orig_crate, $trait_path, t_gen_args, $m.sig.ident, ident).unwrap();
 								} else {
-									write!(w, "{}::{}::{}(", types.orig_crate, resolved_path, $m.sig.ident).unwrap();
+									write!(w, "<native{} as {}::{}<{}>>::{}(", ident, types.orig_crate, $trait_path, t_gen_args, $m.sig.ident).unwrap();
 								}
 
 								let mut real_type = "".to_string();
@@ -875,20 +881,19 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 						for item in i.items.iter() {
 							match item {
 								syn::ImplItem::Method(m) => {
-									impl_meth!(m, trait_obj, "");
+									impl_meth!(m, full_trait_path, trait_obj, "");
 								},
 								syn::ImplItem::Type(_) => {},
 								_ => unimplemented!(),
 							}
 						}
 						walk_supertraits!(trait_obj, Some(&types), (
-							(s, t) => {
+							(s, _) => {
 								if let Some(supertrait_obj) = types.crate_types.traits.get(s).cloned() {
-									writeln!(w, "use {}::{} as native{}Trait;", types.orig_crate, s, t).unwrap();
 									for item in supertrait_obj.items.iter() {
 										match item {
 											syn::TraitItem::Method(m) => {
-												impl_meth!(m, supertrait_obj, "\t");
+												impl_meth!(m, s, supertrait_obj, "\t");
 											},
 											_ => {},
 										}
@@ -903,11 +908,12 @@ 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", "clone", "Clone"]) && types.c_type_has_inner_from_path(&resolved_path) {
+					} 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();
 						writeln!(w, "\tfn clone(&self) -> Self {{").unwrap();
 						writeln!(w, "\t\tSelf {{").unwrap();
-						writeln!(w, "\t\t\tinner: if self.inner.is_null() {{ std::ptr::null_mut() }} else {{").unwrap();
+						writeln!(w, "\t\t\tinner: if <*mut native{}>::is_null(self.inner) {{ std::ptr::null_mut() }} else {{", ident).unwrap();
 						writeln!(w, "\t\t\t\tBox::into_raw(Box::new(unsafe {{ &*self.inner }}.clone())) }},").unwrap();
 						writeln!(w, "\t\t\tis_owned: true,").unwrap();
 						writeln!(w, "\t\t}}\n\t}}\n}}").unwrap();
@@ -1075,6 +1081,17 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 				writeln!(w, ",").unwrap();
 			}
 			write!(w, "\t}}").unwrap();
+		} else if let syn::Fields::Unnamed(fields) = &var.fields {
+			needs_free = true;
+			write!(w, "(").unwrap();
+			for (idx, field) in fields.unnamed.iter().enumerate() {
+				if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
+				types.write_c_type(w, &field.ty, None, false);
+				if idx != fields.unnamed.len() - 1 {
+					write!(w, ",").unwrap();
+				}
+			}
+			write!(w, ")").unwrap();
 		}
 		if var.discriminant.is_some() { unimplemented!(); }
 		writeln!(w, ",").unwrap();
@@ -1093,28 +1110,35 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 						write!(w, "{}{}, ", if $ref { "ref " } else { "mut " }, field.ident.as_ref().unwrap()).unwrap();
 					}
 					write!(w, "}} ").unwrap();
+				} else if let syn::Fields::Unnamed(fields) = &var.fields {
+					write!(w, "(").unwrap();
+					for (idx, field) in fields.unnamed.iter().enumerate() {
+						if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
+						write!(w, "{}{}, ", if $ref { "ref " } else { "mut " }, ('a' as u8 + idx as u8) as char).unwrap();
+					}
+					write!(w, ") ").unwrap();
 				}
 				write!(w, "=>").unwrap();
-				if let syn::Fields::Named(fields) = &var.fields {
-					write!(w, " {{\n\t\t\t\t").unwrap();
-					for field in fields.named.iter() {
-						if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
+
+				macro_rules! handle_field_a {
+					($field: expr, $field_ident: expr) => { {
+						if export_status(&$field.attrs) == ExportStatus::TestOnly { continue; }
 						let mut sink = ::std::io::sink();
 						let mut out: &mut dyn std::io::Write = if $ref { &mut sink } else { w };
 						let new_var = if $to_c {
-							types.write_to_c_conversion_new_var(&mut out, field.ident.as_ref().unwrap(), &field.ty, None, false)
+							types.write_to_c_conversion_new_var(&mut out, $field_ident, &$field.ty, None, false)
 						} else {
-							types.write_from_c_conversion_new_var(&mut out, field.ident.as_ref().unwrap(), &field.ty, None)
+							types.write_from_c_conversion_new_var(&mut out, $field_ident, &$field.ty, None)
 						};
 						if $ref || new_var {
 							if $ref {
-								write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", field.ident.as_ref().unwrap(), field.ident.as_ref().unwrap()).unwrap();
+								write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", $field_ident, $field_ident).unwrap();
 								if new_var {
-									let nonref_ident = syn::Ident::new(&format!("{}_nonref", field.ident.as_ref().unwrap()), Span::call_site());
+									let nonref_ident = syn::Ident::new(&format!("{}_nonref", $field_ident), Span::call_site());
 									if $to_c {
-										types.write_to_c_conversion_new_var(w, &nonref_ident, &field.ty, None, false);
+										types.write_to_c_conversion_new_var(w, &nonref_ident, &$field.ty, None, false);
 									} else {
-										types.write_from_c_conversion_new_var(w, &nonref_ident, &field.ty, None);
+										types.write_from_c_conversion_new_var(w, &nonref_ident, &$field.ty, None);
 									}
 									write!(w, "\n\t\t\t\t").unwrap();
 								}
@@ -1122,31 +1146,58 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 								write!(w, "\n\t\t\t\t").unwrap();
 							}
 						}
+					} }
+				}
+				if let syn::Fields::Named(fields) = &var.fields {
+					write!(w, " {{\n\t\t\t\t").unwrap();
+					for field in fields.named.iter() {
+						handle_field_a!(field, field.ident.as_ref().unwrap());
+					}
+				} else if let syn::Fields::Unnamed(fields) = &var.fields {
+					write!(w, " {{\n\t\t\t\t").unwrap();
+					for (idx, field) in fields.unnamed.iter().enumerate() {
+						handle_field_a!(field, &syn::Ident::new(&(('a' as u8 + idx as u8) as char).to_string(), Span::call_site()));
 					}
 				} else { write!(w, " ").unwrap(); }
+
 				write!(w, "{}{}::{}", if $to_c { "" } else { "native" }, e.ident, var.ident).unwrap();
-				if let syn::Fields::Named(fields) = &var.fields {
-					write!(w, " {{").unwrap();
-					for field in fields.named.iter() {
-						if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
-						write!(w, "\n\t\t\t\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
+
+				macro_rules! handle_field_b {
+					($field: expr, $field_ident: expr) => { {
+						if export_status(&$field.attrs) == ExportStatus::TestOnly { continue; }
 						if $to_c {
-							types.write_to_c_conversion_inline_prefix(w, &field.ty, None, false);
+							types.write_to_c_conversion_inline_prefix(w, &$field.ty, None, false);
 						} else {
-							types.write_from_c_conversion_prefix(w, &field.ty, None);
+							types.write_from_c_conversion_prefix(w, &$field.ty, None);
 						}
-						write!(w, "{}{}",
-							field.ident.as_ref().unwrap(),
+						write!(w, "{}{}", $field_ident,
 							if $ref { "_nonref" } else { "" }).unwrap();
 						if $to_c {
-							types.write_to_c_conversion_inline_suffix(w, &field.ty, None, false);
+							types.write_to_c_conversion_inline_suffix(w, &$field.ty, None, false);
 						} else {
-							types.write_from_c_conversion_suffix(w, &field.ty, None);
+							types.write_from_c_conversion_suffix(w, &$field.ty, None);
 						}
 						write!(w, ",").unwrap();
+					} }
+				}
+
+				if let syn::Fields::Named(fields) = &var.fields {
+					write!(w, " {{").unwrap();
+					for field in fields.named.iter() {
+						if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
+						write!(w, "\n\t\t\t\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
+						handle_field_b!(field, field.ident.as_ref().unwrap());
 					}
 					writeln!(w, "\n\t\t\t\t}}").unwrap();
 					write!(w, "\t\t\t}}").unwrap();
+				} else if let syn::Fields::Unnamed(fields) = &var.fields {
+					write!(w, " (").unwrap();
+					for (idx, field) in fields.unnamed.iter().enumerate() {
+						write!(w, "\n\t\t\t\t\t").unwrap();
+						handle_field_b!(field, &syn::Ident::new(&(('a' as u8 + idx as u8) as char).to_string(), Span::call_site()));
+					}
+					writeln!(w, "\n\t\t\t\t)").unwrap();
+					write!(w, "\t\t\t}}").unwrap();
 				}
 				writeln!(w, ",").unwrap();
 			}