X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-c-bindings;a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Fblocks.rs;h=b2f952be5fa1cb3fdcb6f51a6d677d7680f59d60;hp=57135789b71079f97961f1aa3e020acfcf64f4bf;hb=dd5bf474af6c806b20c26f4f2b751f3226a94dfd;hpb=18337a0191c3abdca8d51861c328dd3d2d9ca6b7

diff --git a/c-bindings-gen/src/blocks.rs b/c-bindings-gen/src/blocks.rs
index 5713578..b2f952b 100644
--- a/c-bindings-gen/src/blocks.rs
+++ b/c-bindings-gen/src/blocks.rs
@@ -124,6 +124,12 @@ pub fn write_result_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "}}").unwrap();
 
+	writeln!(w, "/// Checks if the given object is currently in the success state").unwrap();
+	writeln!(w, "#[no_mangle]").unwrap();
+	writeln!(w, "pub extern \"C\" fn {}_is_ok(o: &{}) -> bool {{", mangled_container, mangled_container).unwrap();
+	writeln!(w, "\to.result_ok").unwrap();
+	writeln!(w, "}}").unwrap();
+
 	writeln!(w, "#[no_mangle]").unwrap();
 	writeln!(w, "/// Frees any resources used by the {}.", mangled_container).unwrap();
 	writeln!(w, "pub extern \"C\" fn {}_free(_res: {}) {{ }}", mangled_container, mangled_container).unwrap();
@@ -340,27 +346,38 @@ pub fn write_option_block<W: std::io::Write>(w: &mut W, mangled_container: &str,
 	writeln!(w, "/// An enum which can either contain a {} or not", inner_type).unwrap();
 	writeln!(w, "pub enum {} {{", mangled_container).unwrap();
 	writeln!(w, "\t/// When we're in this state, this {} contains a {}", mangled_container, inner_type).unwrap();
-	writeln!(w, "\tSome({}),", inner_type).unwrap();
+	if inner_type != "" {
+		writeln!(w, "\tSome({}),", inner_type).unwrap();
+	} else {
+		writeln!(w, "\tSome,").unwrap();
+	}
 	writeln!(w, "\t/// When we're in this state, this {} contains nothing", mangled_container).unwrap();
 	writeln!(w, "\tNone").unwrap();
 	writeln!(w, "}}").unwrap();
 
 	writeln!(w, "impl {} {{", mangled_container).unwrap();
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn is_some(&self) -> bool {{").unwrap();
-	writeln!(w, "\t\tif let Self::Some(_) = self {{ true }} else {{ false }}").unwrap();
+	writeln!(w, "\t\tif let Self::None = self {{ false }} else {{ true }}").unwrap();
 	writeln!(w, "\t}}").unwrap();
 	writeln!(w, "\t#[allow(unused)] pub(crate) fn is_none(&self) -> bool {{").unwrap();
 	writeln!(w, "\t\t!self.is_some()").unwrap();
 	writeln!(w, "\t}}").unwrap();
-	writeln!(w, "\t#[allow(unused)] pub(crate) fn take(mut self) -> {} {{", inner_type).unwrap();
-	writeln!(w, "\t\tif let Self::Some(v) = self {{ v }} else {{ unreachable!() }}").unwrap();
-	writeln!(w, "\t}}").unwrap();
+	if inner_type != "" {
+		writeln!(w, "\t#[allow(unused)] pub(crate) fn take(mut self) -> {} {{", inner_type).unwrap();
+		writeln!(w, "\t\tif let Self::Some(v) = self {{ v }} else {{ unreachable!() }}").unwrap();
+		writeln!(w, "\t}}").unwrap();
+	}
 	writeln!(w, "}}").unwrap();
 
 	writeln!(w, "#[no_mangle]").unwrap();
 	writeln!(w, "/// Constructs a new {} containing a {}", mangled_container, inner_type).unwrap();
-	writeln!(w, "pub extern \"C\" fn {}_some(o: {}) -> {} {{", mangled_container, inner_type, mangled_container).unwrap();
-	writeln!(w, "\t{}::Some(o)", mangled_container).unwrap();
+	if inner_type != "" {
+		writeln!(w, "pub extern \"C\" fn {}_some(o: {}) -> {} {{", mangled_container, inner_type, mangled_container).unwrap();
+		writeln!(w, "\t{}::Some(o)", mangled_container).unwrap();
+	} else {
+		writeln!(w, "pub extern \"C\" fn {}_some() -> {} {{", mangled_container, mangled_container).unwrap();
+		writeln!(w, "\t{}::Some", mangled_container).unwrap();
+	}
 	writeln!(w, "}}").unwrap();
 
 	writeln!(w, "#[no_mangle]").unwrap();