From: Matt Corallo Date: Thu, 2 Dec 2021 15:57:15 +0000 (+0000) Subject: Construct a method to clone returning a pointerand not a human object X-Git-Tag: v0.0.103.1^2~7 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=74893948607429b046f8cd3b10fa5bc95880038b;p=ldk-java Construct a method to clone returning a pointerand not a human object --- diff --git a/genbindings.py b/genbindings.py index 5c6478d1..247aecb3 100755 --- a/genbindings.py +++ b/genbindings.py @@ -430,6 +430,15 @@ with open(sys.argv[1]) as in_h, open(f"{sys.argv[2]}/bindings{consts.file_ext}", else: return_type_info = type_mapping_generator.map_type(method_return_type.strip() + " ret", True, ret_arr_len, False, force_holds_ref) + if method_name.endswith("_clone") and expected_struct not in unitary_enums: + meth_line = "uint64_t " + expected_struct.replace("LDK", "") + "_clone_ptr(" + expected_struct + " *NONNULL_PTR arg)" + write_c("static inline " + meth_line + " {\n") + write_c("\t" + return_type_info.ret_conv[0].replace("\n", "\n\t")) + write_c(method_name + "(arg)") + write_c(return_type_info.ret_conv[1]) + write_c("\n\treturn " + return_type_info.ret_conv_name + ";\n}\n") + map_fn(meth_line + ";\n", re.compile("(uint64_t) ([A-Za-z_0-9]*)\((.*)\)").match(meth_line), None, None, None) + argument_types = [] default_constructor_args = {} takes_self = False diff --git a/java_strings.py b/java_strings.py index 327a1f3e..3827005a 100644 --- a/java_strings.py +++ b/java_strings.py @@ -1201,6 +1201,8 @@ import javax.annotation.Nullable; out_java_struct += "\tpublic static " + return_type_info.java_hu_ty + " with_default(" else: out_java_struct += "\tpublic static " + return_type_info.java_hu_ty + " " + meth_n + "(" + elif meth_n == "clone_ptr": + out_java_struct += ("\t" + return_type_info.java_hu_ty + " " + meth_n + "(") else: out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") for idx, arg in enumerate(argument_types):