From ece2ac7ada46913e4250ba0ff0d71b5a70ae28f6 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 29 Apr 2021 18:29:34 +0000 Subject: [PATCH] Map more methods that go in UtilMethods --- genbindings.py | 4 ++-- java_strings.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/genbindings.py b/genbindings.py index 32980aa3..fe0d6f74 100755 --- a/genbindings.py +++ b/genbindings.py @@ -468,8 +468,8 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java: or expected_struct in complex_enums or expected_cstruct in complex_enums or expected_cstruct in result_types) and not is_free: out_java_struct = open(f"{sys.argv[3]}/structs/{struct_meth}{consts.file_ext}", "a") - elif method_name.startswith("C2Tuple_") and method_name.endswith("_read"): - struct_meth = method_name.rsplit("_", 1)[0] + elif (method_name.startswith("C2Tuple_") and method_name.endswith("_read")) or \ + (return_type_info.rust_obj is not None and "Result" in return_type_info.rust_obj and "from" in method_name): out_java_struct = open(f"{sys.argv[3]}/structs/UtilMethods{consts.file_ext}", "a") if out_java_struct is not None: out_java_struct.write(out_java_struct_delta) diff --git a/java_strings.py b/java_strings.py index 96d69096..0c86200e 100644 --- a/java_strings.py +++ b/java_strings.py @@ -60,6 +60,7 @@ public class bindings { self.util_fn_pfx = """package org.ldk.structs; import org.ldk.impl.bindings; import java.util.Arrays; +import org.ldk.enums.*; public class UtilMethods { """ -- 2.30.2