projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Map enum functions into human structs and Result types sanely
[ldk-java]
/
java_strings.py
diff --git
a/java_strings.py
b/java_strings.py
index 1633756431634f47efaa60fb3e86aade84003691..14c6a9f61fb8c6387f1f688a9ea79faf75b12b72 100644
(file)
--- a/
java_strings.py
+++ b/
java_strings.py
@@
-763,7
+763,7
@@
import java.util.Arrays;
return base_conv
def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment):
return base_conv
def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment):
- java_hu_type = struct_name.replace("LDK", "")
+ java_hu_type = struct_name.replace("LDK", "")
.replace("COption", "Option")
out_java_enum = ""
out_java = ""
out_c = ""
out_java_enum = ""
out_java = ""
out_c = ""
@@
-776,7
+776,7
@@
import java.util.Arrays;
out_java_enum += ("\t@Override @SuppressWarnings(\"deprecation\")\n")
out_java_enum += ("\tprotected void finalize() throws Throwable {\n")
out_java_enum += ("\t\tsuper.finalize();\n")
out_java_enum += ("\t@Override @SuppressWarnings(\"deprecation\")\n")
out_java_enum += ("\tprotected void finalize() throws Throwable {\n")
out_java_enum += ("\t\tsuper.finalize();\n")
- out_java_enum += ("\t\tif (ptr != 0) { bindings." +
java_hu_type
+ "_free(ptr); }\n")
+ out_java_enum += ("\t\tif (ptr != 0) { bindings." +
struct_name.replace("LDK", "")
+ "_free(ptr); }\n")
out_java_enum += ("\t}\n")
out_java_enum += ("\tstatic " + java_hu_type + " constr_from_ptr(long ptr) {\n")
out_java_enum += ("\t\tbindings." + struct_name + " raw_val = bindings." + struct_name + "_ref_from_ptr(ptr);\n")
out_java_enum += ("\t}\n")
out_java_enum += ("\tstatic " + java_hu_type + " constr_from_ptr(long ptr) {\n")
out_java_enum += ("\t\tbindings." + struct_name + " raw_val = bindings." + struct_name + "_ref_from_ptr(ptr);\n")
@@
-845,7
+845,6
@@
import java.util.Arrays;
out_c += ("\t\t}\n")
out_c += ("\t\tdefault: abort();\n")
out_c += ("\t}\n}\n")
out_c += ("\t\t}\n")
out_c += ("\t\tdefault: abort();\n")
out_c += ("\t}\n}\n")
- out_java_enum += ("}\n")
return (out_java, out_java_enum, out_c)
def map_opaque_struct(self, struct_name, struct_doc_comment):
return (out_java, out_java_enum, out_c)
def map_opaque_struct(self, struct_name, struct_doc_comment):
@@
-896,7
+895,7
@@
import java.util.Arrays;
if not args_known:
out_java_struct += ("\t// Skipped " + method_name + "\n")
else:
if not args_known:
out_java_struct += ("\t// Skipped " + method_name + "\n")
else:
- meth_n = method_name[len(struct_meth) + 1:]
+ meth_n = method_name[len(struct_meth) + 1:]
.strip("_")
if doc_comment is not None:
out_java_struct += "\t/**\n\t * " + doc_comment.replace("\n", "\n\t * ") + "\n\t */\n"
if not takes_self:
if doc_comment is not None:
out_java_struct += "\t/**\n\t * " + doc_comment.replace("\n", "\n\t * ") + "\n\t */\n"
if not takes_self: