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

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index a93122daf..a40875d95 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -903,7 +903,8 @@ 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();
@@ -1075,6 +1076,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 +1105,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 +1141,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();
 			}