X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fmain.rs;h=7f5a3ed4b33c0fa66b213646f8c720189593f330;hb=9e7c25670d70934a62f711c71e651854321c0d7b;hp=faa51f5460163b759ada3d936855b7bca0ecbe16;hpb=09c8d62d937e86eee350898c7187dad498f0ec81;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/main.rs b/c-bindings-gen/src/main.rs
index faa51f5..7f5a3ed 100644
--- a/c-bindings-gen/src/main.rs
+++ b/c-bindings-gen/src/main.rs
@@ -33,6 +33,8 @@ mod blocks;
 use types::*;
 use blocks::*;
 
+const DEFAULT_IMPORTS: &'static str = "\nuse std::str::FromStr;\nuse std::ffi::c_void;\nuse bitcoin::hashes::Hash;\nuse crate::c_types::*;\n";
+
 // *************************************
 // *** Manually-expanded conversions ***
 // *************************************
@@ -386,7 +388,7 @@ fn writeln_trait<'a, 'b, W: std::io::Write>(w: &mut W, t: &'a syn::ItemTrait, ty
 													ident.mutability.is_some() || ident.subpat.is_some() {
 												unimplemented!();
 											}
-											write!(w, ", {}{}: ", if $type_resolver.skip_arg(&*arg.ty, Some(&meth_gen_types)) { "_" } else { "" }, ident.ident).unwrap();
+											write!(w, ", mut {}{}: ", if $type_resolver.skip_arg(&*arg.ty, Some(&meth_gen_types)) { "_" } else { "" }, ident.ident).unwrap();
 										}
 										_ => unimplemented!(),
 									}
@@ -956,6 +958,39 @@ fn writeln_impl<W: std::io::Write>(w: &mut W, i: &syn::ItemImpl, types: &mut Typ
 						writeln!(w, "/// Creates a copy of the {}", ident).unwrap();
 						writeln!(w, "pub extern \"C\" fn {}_clone(orig: &{}) -> {} {{", ident, ident, ident).unwrap();
 						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") {
+							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()) {{", 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();
+							types.write_to_c_conversion_inline_prefix(w, &*i.self_ty, Some(&gen_types), false);
+							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}}.into()\n}}").unwrap();
+						}
+					} else if path_matches_nongeneric(&trait_path.1, &["Display"]) {
+						writeln!(w, "#[no_mangle]").unwrap();
+						writeln!(w, "/// Get the string representation of a {} object", ident).unwrap();
+						writeln!(w, "pub extern \"C\" fn {}_to_str(o: &crate::{}) -> Str {{", ident, resolved_path).unwrap();
+
+						let self_ty = &i.self_ty;
+						let ref_type: syn::Type = syn::parse_quote!(&#self_ty);
+						let new_var = types.write_from_c_conversion_new_var(w, &format_ident!("o"), &ref_type, Some(&gen_types));
+						write!(w, "\tformat!(\"{{}}\", ").unwrap();
+						types.write_from_c_conversion_prefix(w, &ref_type, Some(&gen_types));
+						write!(w, "{}o", if new_var { "local_" } else { "" }).unwrap();
+						types.write_from_c_conversion_suffix(w, &ref_type, Some(&gen_types));
+						writeln!(w, ").into()").unwrap();
+
 						writeln!(w, "}}").unwrap();
 					} else {
 						//XXX: implement for other things like ToString
@@ -1102,9 +1137,8 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 	}
 	writeln_docs(w, &e.attrs, "");
 
-	if e.generics.lt_token.is_some() {
-		unimplemented!();
-	}
+	let mut gen_types = GenericTypes::new(None);
+	assert!(gen_types.learn_generics(&e.generics, types));
 
 	let mut needs_free = false;
 
@@ -1120,7 +1154,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 				if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
 				writeln_docs(w, &field.attrs, "\t\t");
 				write!(w, "\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
-				types.write_c_type(w, &field.ty, None, false);
+				types.write_c_type(w, &field.ty, Some(&gen_types), false);
 				writeln!(w, ",").unwrap();
 			}
 			write!(w, "\t}}").unwrap();
@@ -1129,7 +1163,7 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 			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);
+				types.write_c_type(w, &field.ty, Some(&gen_types), false);
 				if idx != fields.unnamed.len() - 1 {
 					write!(w, ",").unwrap();
 				}
@@ -1169,9 +1203,9 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 						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, &$field.ty, None, false)
+							types.write_to_c_conversion_new_var(&mut out, $field_ident, &$field.ty, Some(&gen_types), false)
 						} else {
-							types.write_from_c_conversion_new_var(&mut out, $field_ident, &$field.ty, None)
+							types.write_from_c_conversion_new_var(&mut out, $field_ident, &$field.ty, Some(&gen_types))
 						};
 						if $ref || new_var {
 							if $ref {
@@ -1179,9 +1213,9 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 								if new_var {
 									let nonref_ident = format_ident!("{}_nonref", $field_ident);
 									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, Some(&gen_types), 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, Some(&gen_types));
 									}
 									write!(w, "\n\t\t\t\t").unwrap();
 								}
@@ -1209,16 +1243,16 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
 					($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, Some(&gen_types), false);
 						} else {
-							types.write_from_c_conversion_prefix(w, &$field.ty, None);
+							types.write_from_c_conversion_prefix(w, &$field.ty, Some(&gen_types));
 						}
 						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, Some(&gen_types), false);
 						} else {
-							types.write_from_c_conversion_suffix(w, &$field.ty, None);
+							types.write_from_c_conversion_suffix(w, &$field.ty, Some(&gen_types));
 						}
 						write!(w, ",").unwrap();
 					} }
@@ -1289,6 +1323,35 @@ fn writeln_fn<'a, 'b, W: std::io::Write>(w: &mut W, f: &'a syn::ItemFn, types: &
 // *** 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) {
+	// 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();
+	for item in module.content.as_ref().unwrap().1.iter() {
+		if let syn::Item::Use(_) = item {
+			use_items.push(item);
+		}
+	}
+	let import_resolver = ImportResolver::from_borrowed_items(mod_path.splitn(2, "::").next().unwrap(), &libast.dependencies, mod_path, &use_items);
+	let mut types = TypeResolver::new(mod_path, import_resolver, crate_types);
+
+	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::Impl(i) => {
+				if let &syn::Type::Path(ref p) = &*i.self_ty {
+					if p.path.get_ident().is_some() {
+						writeln_impl(w, i, &mut types);
+					}
+				}
+			},
+			_ => {},
+		}
+	}
+	writeln!(w, "}}").unwrap();
+}
+
 /// Do the Real Work of mapping an original file to C-callable wrappers. Creates a new file at
 /// `out_path` and fills it with wrapper structs/functions to allow calling the things in the AST
 /// at `module` from C.
@@ -1333,11 +1396,12 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a>
 			writeln!(out, "#![allow(unused_parens)]").unwrap();
 			writeln!(out, "#![allow(unused_unsafe)]").unwrap();
 			writeln!(out, "#![allow(unused_braces)]").unwrap();
-			writeln!(out, "#![deny(missing_docs)]").unwrap();
+			// TODO: We need to map deny(missing_docs) in the source crate(s)
+			//writeln!(out, "#![deny(missing_docs)]").unwrap();
 			writeln!(out, "pub mod c_types;").unwrap();
 			writeln!(out, "pub mod bitcoin;").unwrap();
 		} else {
-			writeln!(out, "\nuse std::ffi::c_void;\nuse bitcoin::hashes::Hash;\nuse crate::c_types::*;\n").unwrap();
+			writeln!(out, "{}", DEFAULT_IMPORTS).unwrap();
 		}
 
 		for m in submods {
@@ -1371,7 +1435,9 @@ fn convert_file<'a, 'b>(libast: &'a FullLibraryAST, crate_types: &CrateTypes<'a>
 						writeln_trait(&mut out, &t, &mut type_resolver, header_file, cpp_header_file);
 					}
 				},
-				syn::Item::Mod(_) => {}, // We don't have to do anything - the top loop handles these.
+				syn::Item::Mod(m) => {
+					convert_priv_mod(&mut out, libast, crate_types, out_dir, &format!("{}::{}", module, m.ident), m);
+				},
 				syn::Item::Const(c) => {
 					// Re-export any primitive-type constants.
 					if let syn::Visibility::Public(_) = c.vis {