X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=7c7cad305f4d3ffb2da97a79cf94842d41bcff7d;hb=0097a4856a3c3c970adb76f7472805cbac62e4ef;hp=cc72d29693c4305d7e30b73fe5b033af2a10fcfe;hpb=7ab19163bac30ec500d40f1c3f9ba6efad3d0966;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index cc72d29..7c7cad3 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -102,21 +102,44 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 
 				let mut arg_conv = Vec::new();
 				if t == "lightning::util::ser::ReadableArgs" {
-					write!(w, ", arg: ").unwrap();
 					assert!(trait_path.leading_colon.is_none());
 					let args_seg = trait_path.segments.iter().last().unwrap();
 					assert_eq!(format!("{}", args_seg.ident), "ReadableArgs");
 					if let syn::PathArguments::AngleBracketed(args) = &args_seg.arguments {
 						assert_eq!(args.args.len(), 1);
 						if let syn::GenericArgument::Type(args_ty) = args.args.iter().next().unwrap() {
-							types.write_c_type(w, args_ty, Some(generics), false);
+							macro_rules! write_arg_conv {
+								($ty: expr, $arg_name: expr) => {
+									write!(w, ", {}: ", $arg_name).unwrap();
+									types.write_c_type(w, $ty, Some(generics), false);
+
+									write!(&mut arg_conv, "\t").unwrap();
+									if types.write_from_c_conversion_new_var(&mut arg_conv, &format_ident!("{}", $arg_name), &$ty, Some(generics)) {
+										write!(&mut arg_conv, "\n\t").unwrap();
+									}
 
-							assert!(!types.write_from_c_conversion_new_var(&mut arg_conv, &format_ident!("arg"), &args_ty, Some(generics)));
+									write!(&mut arg_conv, "let {}_conv = ", $arg_name).unwrap();
+									types.write_from_c_conversion_prefix(&mut arg_conv, &$ty, Some(generics));
+									write!(&mut arg_conv, "{}", $arg_name).unwrap();
+									types.write_from_c_conversion_suffix(&mut arg_conv, &$ty, Some(generics));
+									write!(&mut arg_conv, ";\n").unwrap();
+								}
+							}
 
-							write!(&mut arg_conv, "\tlet arg_conv = ").unwrap();
-							types.write_from_c_conversion_prefix(&mut arg_conv, &args_ty, Some(generics));
-							write!(&mut arg_conv, "arg").unwrap();
-							types.write_from_c_conversion_suffix(&mut arg_conv, &args_ty, Some(generics));
+							if let syn::Type::Tuple(tup) = args_ty {
+								// Crack open tuples and make them separate arguments instead of
+								// converting the full tuple. This makes it substantially easier to
+								// reason about things like references in the tuple fields.
+								let mut arg_conv_res = Vec::new();
+								for (idx, elem) in tup.elems.iter().enumerate() {
+									let arg_name = format!("arg_{}", ('a' as u8 + idx as u8) as char);
+									write_arg_conv!(elem, arg_name);
+									write!(&mut arg_conv_res, "{}_conv{}", arg_name, if idx != tup.elems.len() - 1 { ", " } else { "" }).unwrap();
+								}
+								writeln!(&mut arg_conv, "\tlet arg_conv = ({});", String::from_utf8(arg_conv_res).unwrap()).unwrap();
+							} else {
+								write_arg_conv!(args_ty, "arg");
+							}
 						} else { unreachable!(); }
 					} else { unreachable!(); }
 				} else if t == "lightning::util::ser::MaybeReadable" {
@@ -128,7 +151,6 @@ fn maybe_convert_trait_impl<W: std::io::Write>(w: &mut W, trait_path: &syn::Path
 
 				if t == "lightning::util::ser::ReadableArgs" {
 					w.write(&arg_conv).unwrap();
-					write!(w, ";\n").unwrap();
 				}
 
 				write!(w, "\tlet res: ").unwrap();
@@ -1223,13 +1245,22 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 						writeln!(w, "\torig.clone()").unwrap();
 						writeln!(w, "}}").unwrap();
 					} else if path_matches_nongeneric(&trait_path.1, &["FromStr"]) {
-						if let Some(container) = types.get_c_mangled_container_type(
-								vec![&*i.self_ty, &syn::Type::Tuple(syn::TypeTuple { paren_token: Default::default(), elems: syn::punctuated::Punctuated::new() })],
-								Some(&gen_types), "Result") {
+						let mut err_opt = None;
+						for item in i.items.iter() {
+							match item {
+								syn::ImplItem::Type(ty) if format!("{}", ty.ident) == "Err" => {
+									err_opt = Some(&ty.ty);
+								},
+								_ => {}
+							}
+						}
+						let err_ty = err_opt.unwrap();
+						if let Some(container) = types.get_c_mangled_container_type(vec![&*i.self_ty, &err_ty], Some(&gen_types), "Result") {
 							writeln!(w, "#[no_mangle]").unwrap();
 							writeln!(w, "/// Read a {} object from a string", ident).unwrap();
 							writeln!(w, "pub extern \"C\" fn {}_from_str(s: crate::c_types::Str) -> {} {{", ident, container).unwrap();
 							writeln!(w, "\tmatch {}::from_str(s.into_str()) {{", resolved_path).unwrap();
+
 							writeln!(w, "\t\tOk(r) => {{").unwrap();
 							let new_var = types.write_to_c_conversion_new_var(w, &format_ident!("r"), &*i.self_ty, Some(&gen_types), false);
 							write!(w, "\t\t\tcrate::c_types::CResultTempl::ok(\n\t\t\t\t").unwrap();
@@ -1237,7 +1268,15 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 							write!(w, "{}r", if new_var { "local_" } else { "" }).unwrap();
 							types.write_to_c_conversion_inline_suffix(w, &*i.self_ty, Some(&gen_types), false);
 							writeln!(w, "\n\t\t\t)\n\t\t}},").unwrap();
-							writeln!(w, "\t\tErr(e) => crate::c_types::CResultTempl::err(()),").unwrap();
+
+							writeln!(w, "\t\tErr(e) => {{").unwrap();
+							let new_var = types.write_to_c_conversion_new_var(w, &format_ident!("e"), &err_ty, Some(&gen_types), false);
+							write!(w, "\t\t\tcrate::c_types::CResultTempl::err(\n\t\t\t\t").unwrap();
+							types.write_to_c_conversion_inline_prefix(w, &err_ty, Some(&gen_types), false);
+							write!(w, "{}e", if new_var { "local_" } else { "" }).unwrap();
+							types.write_to_c_conversion_inline_suffix(w, &err_ty, Some(&gen_types), false);
+							writeln!(w, "\n\t\t\t)\n\t\t}},").unwrap();
+
 							writeln!(w, "\t}}.into()\n}}").unwrap();
 						}
 					} else if path_matches_nongeneric(&trait_path.1, &["Display"]) {