}
"""
- self.c_file_pfx = """#include <rust_types.h>
-#include "js-wasm.h"
+ self.c_file_pfx = """#include "js-wasm.h"
#include <stdatomic.h>
#include <lightning.h>
return (uint32_t)elems;
}
-jstring str_ref_to_ts(const char* chars, size_t len) {
+static inline jstring str_ref_to_ts(const char* chars, size_t len) {
char* err_buf = MALLOC(len + 4, "str conv buf");
*((uint32_t*)err_buf) = len;
memcpy(err_buf + 4, chars, len);
return (uint32_t) err_buf;
}
+static inline LDKStr str_ref_to_owned_c(jstring str) {
+ uint32_t *str_len = (uint32_t*)str;
+ char* newchars = MALLOC(*str_len + 1, "String chars");
+ memcpy(newchars, (const char*)(str + 4), *str_len);
+ newchars[*str_len] = 0;
+ LDKStr res= {
+ .chars = newchars,
+ .len = *str_len,
+ .chars_is_owned = true
+ };
+ return res;
+}
typedef bool jboolean;
self.ptr_native_ty = "number"
self.result_c_ty = "uint32_t"
self.ptr_arr = "ptrArray"
+ self.is_arr_some_check = ("", " != 0")
self.get_native_arr_len_call = ("*((uint32_t*)", ")")
def release_native_arr_ptr_call(self, ty_info, arr_var, arr_ptr_var):
else:
return None
- def str_ref_to_c_call(self, var_name, str_len):
+ def str_ref_to_native_call(self, var_name, str_len):
return "str_ref_to_ts(" + var_name + ", " + str_len + ")"
+ def str_ref_to_c_call(self, var_name):
+ return "str_ref_to_owned_c(" + var_name + ")"
def c_fn_name_define_pfx(self, fn_name, have_args):
return " __attribute__((visibility(\"default\"))) TS_" + fn_name + "("
def init_str(self):
return ""
- def native_c_unitary_enum_map(self, struct_name, variants):
- out_c = "static inline " + struct_name + " " + struct_name + "_from_js(int32_t ord) {\n"
+ def native_c_unitary_enum_map(self, struct_name, variants, enum_doc_comment):
+ out_c = "static inline LDK" + struct_name + " LDK" + struct_name + "_from_js(int32_t ord) {\n"
out_c = out_c + "\tswitch (ord) {\n"
ord_v = 0
out_c = out_c + "\tabort();\n"
out_c = out_c + "}\n"
- out_c = out_c + "static inline int32_t " + struct_name + "_to_js(" + struct_name + " val) {\n"
+ out_c = out_c + "static inline int32_t LDK" + struct_name + "_to_js(LDK" + struct_name + " val) {\n"
out_c = out_c + "\tswitch (val) {\n"
ord_v = 0
for var in variants:
ret = ret + "; (void) " + param
return ret
- def native_c_map_trait(self, struct_name, field_var_conversions, field_function_lines):
+ def native_c_map_trait(self, struct_name, field_var_conversions, flattened_field_var_conversions, field_function_lines, trait_doc_comment):
out_typescript_bindings = "\n\n\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: START\n\n"
constructor_arguments = ""
super_instantiator = ""
pointer_to_adder = ""
impl_constructor_arguments = ""
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
constructor_arguments += f", {first_to_lower(var.arg_name)}?: {var.java_hu_ty}"
impl_constructor_arguments += f", {var.arg_name}: {var.java_hu_ty}"
java_methods = []
for fn_line in field_function_lines:
java_method_descriptor = ""
- if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
+ if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
out_java_interface += fn_line.fn_name + "("
out_interface_implementation_overrides += f"{fn_line.fn_name} ("
if isinstance(var, ConvInfo):
trait_constructor_arguments += ", " + var.arg_name
else:
- trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance"
+ trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl"
+ for suparg in var[2]:
+ if isinstance(suparg, ConvInfo):
+ trait_constructor_arguments += ", " + suparg.arg_name
+ else:
+ trait_constructor_arguments += ", " + suparg[1]
+ trait_constructor_arguments += ").bindings_instance"
+ for suparg in var[2]:
+ if isinstance(suparg, ConvInfo):
+ trait_constructor_arguments += ", " + suparg.arg_name
+ else:
+ trait_constructor_arguments += ", " + suparg[1]
out_typescript_human = f"""
{self.hu_struct_file_prefix}
out_typescript_bindings += "\t\texport interface " + struct_name + " {\n"
java_meths = []
for fn_line in field_function_lines:
- if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
+ if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
out_typescript_bindings += f"\t\t\t{fn_line.fn_name} ("
for idx, arg_conv_info in enumerate(fn_line.args_ty):
out_typescript_bindings = out_typescript_bindings + "\t\t}\n\n"
out_typescript_bindings += f"\t\texport function {struct_name}_new(impl: {struct_name}"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_typescript_bindings += f", {var.arg_name}: {var.java_ty}"
else:
# Now that we've written out our java code (and created java_meths), generate C
out_c = "typedef struct " + struct_name + "_JCalls {\n"
out_c = out_c + "\tatomic_size_t refcnt;\n"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
# We're a regular ol' field
pass
# We're a supertrait
out_c = out_c + "\t" + var[0] + "_JCalls* " + var[1] + ";\n"
for fn in field_function_lines:
- if fn.fn_name != "free" and fn.fn_name != "clone":
+ if fn.fn_name != "free" and fn.fn_name != "cloned":
out_c = out_c + "\tuint32_t " + fn.fn_name + "_meth;\n"
out_c = out_c + "} " + struct_name + "_JCalls;\n"
out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n"
out_c = out_c + "\tif (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {\n"
for fn in field_function_lines:
- if fn.fn_name != "free" and fn.fn_name != "clone":
+ if fn.fn_name != "free" and fn.fn_name != "cloned":
out_c = out_c + "\t\tjs_free(j_calls->" + fn.fn_name + "_meth);\n"
out_c = out_c + "\t\tFREE(j_calls);\n"
out_c = out_c + "\t}\n}\n"
for idx, fn_line in enumerate(field_function_lines):
- if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
+ if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
assert fn_line.ret_ty_info.ty_info.get_full_rust_ty()[1] == ""
- out_c = out_c + fn_line.ret_ty_info.ty_info.get_full_rust_ty()[0] + " " + fn_line.fn_name + "_jcall("
+ out_c = out_c + fn_line.ret_ty_info.ty_info.get_full_rust_ty()[0] + " " + fn_line.fn_name + "_" + struct_name + "_jcall("
if fn_line.self_is_const:
out_c = out_c + "const void* this_arg"
else:
out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n"
if fn_line.ret_ty_info.c_ty.endswith("Array"):
- out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
+ out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
elif fn_line.ret_ty_info.java_ty == "void":
out_c = out_c + "\tjs_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
elif not fn_line.ret_ty_info.passed_as_ptr:
out_c = out_c + "\treturn js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
else:
- out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret = (" + fn_line.ret_ty_info.rust_obj + "*)js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
+ out_c = out_c + "\tuint32_t ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth"
for idx, arg_info in enumerate(fn_line.args_ty):
if arg_info.ret_conv is not None:
out_c = out_c + "}\n"
# Write out a clone function whether we need one or not, as we use them in moving to rust
- out_c = out_c + "static void* " + struct_name + "_JCalls_clone(const void* this_arg) {\n"
- out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n"
+ out_c = out_c + "static void " + struct_name + "_JCalls_cloned(" + struct_name + "* new_obj) {\n"
+ out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) new_obj->this_arg;\n"
out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);\n"
for var in field_var_conversions:
if not isinstance(var, ConvInfo):
out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[1] + "->refcnt, 1, memory_order_release);\n"
- out_c = out_c + "\treturn (void*) this_arg;\n"
out_c = out_c + "}\n"
out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (/*TODO: JS Object Reference */void* o"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_c = out_c + ", " + var.c_ty + " " + var.arg_name
else:
out_c = out_c + "\t//TODO: Assign calls->o from o\n"
for (fn_name, java_meth_descr) in java_meths:
- if fn_name != "free" and fn_name != "clone":
+ if fn_name != "free" and fn_name != "cloned":
out_c = out_c + "\tcalls->" + fn_name + "_meth = (*env)->GetMethodID(env, c, \"" + fn_name + "\", \"" + java_meth_descr + "\");\n"
out_c = out_c + "\tCHECK(calls->" + fn_name + "_meth != NULL);\n"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo) and var.arg_conv is not None:
out_c = out_c + "\n\t" + var.arg_conv.replace("\n", "\n\t") +"\n"
out_c = out_c + "\n\t" + struct_name + " ret = {\n"
out_c = out_c + "\t\t.this_arg = (void*) calls,\n"
for fn_line in field_function_lines:
- if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
- out_c = out_c + "\t\t." + fn_line.fn_name + " = " + fn_line.fn_name + "_jcall,\n"
+ if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
+ out_c = out_c + "\t\t." + fn_line.fn_name + " = " + fn_line.fn_name + "_" + struct_name + "_jcall,\n"
elif fn_line.fn_name == "free":
out_c = out_c + "\t\t.free = " + struct_name + "_JCalls_free,\n"
else:
- out_c = out_c + "\t\t.clone = " + struct_name + "_JCalls_clone,\n"
+ out_c = out_c + "\t\t.cloned = " + struct_name + "_JCalls_cloned,\n"
for var in field_var_conversions:
if isinstance(var, ConvInfo):
if var.arg_conv_name is not None:
out_c = out_c + "\t\t." + var.var_name + " = " + var.var_name + ",\n"
out_c = out_c + "\t\t.set_" + var.var_name + " = NULL,\n"
else:
- out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(" + var[1] + "),\n"
+ out_c += "\t\t." + var[1] + " = " + var[0] + "_init(" + var[1]
+ for suparg in var[2]:
+ if isinstance(suparg, ConvInfo):
+ out_c += ", " + suparg.arg_name
+ else:
+ out_c += ", " + suparg[1]
+ out_c += "),\n"
out_c = out_c + "\t};\n"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if not isinstance(var, ConvInfo):
out_c = out_c + "\tcalls->" + var[1] + " = ret." + var[1] + ".this_arg;\n"
out_c = out_c + "\treturn ret;\n"
out_c = out_c + "}\n"
out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "/*TODO: JS Object Reference */void* o"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_c = out_c + ", " + var.c_ty + " " + var.arg_name
else:
out_c = out_c + ") {\n"
out_c = out_c + "\t" + struct_name + " *res_ptr = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n"
out_c = out_c + "\t*res_ptr = " + struct_name + "_init(o"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_c = out_c + ", " + var.arg_name
else:
def trait_struct_inc_refcnt(self, ty_info):
return ""
- def map_complex_enum(self, struct_name, variant_list, camel_to_snake):
+ def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment):
java_hu_type = struct_name.replace("LDK", "")
out_java_enum = ""
init_meth_params = ""
init_meth_body = ""
hu_conv_body = ""
- for idx, field_ty in enumerate(var.fields):
+ for idx, (field_ty, field_docs) in enumerate(var.fields):
out_java += ("\t\t\tpublic " + field_ty.java_ty + " " + field_ty.arg_name + ";\n")
java_hu_subclasses = java_hu_subclasses + "\tpublic " + field_ty.arg_name + f": {field_ty.java_hu_ty};\n"
if field_ty.to_hu_conv is not None:
out_java += ("\tpublic static native " + struct_name + " " + struct_name + "_ref_from_ptr(long ptr);\n");
out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + self.c_fn_name_define_pfx(struct_name + "_ref_from_ptr", True) + self.ptr_c_ty + " ptr) {\n")
- out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)ptr;\n")
+ out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)(ptr & ~1);\n")
out_c += ("\tswitch(obj->tag) {\n")
for var in variant_list:
out_c += ("\t\tcase " + struct_name + "_" + var.var_name + ": {\n")
c_params = []
- for idx, field_map in enumerate(var.fields):
+ for idx, (field_map, _) in enumerate(var.fields):
if field_map.ret_conv is not None:
out_c += ("\t\t\t" + field_map.ret_conv[0].replace("\n", "\n\t\t\t"))
- out_c += ("obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name)
+ if var.tuple_variant:
+ out_c += "obj->" + camel_to_snake(var.var_name)
+ else:
+ out_c += "obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name
out_c += (field_map.ret_conv[1].replace("\n", "\n\t\t\t") + "\n")
c_params.append(field_map.ret_conv_name)
else:
- c_params.append("obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name)
+ if var.tuple_variant:
+ c_params.append("obj->" + camel_to_snake(var.var_name))
+ else:
+ c_params.append("obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name)
out_c += ("\t\t\treturn " + self.c_constr_native_complex_enum(struct_name, var.var_name, c_params) + ";\n")
out_c += ("\t\t}\n")
out_c += ("\t\tdefault: abort();\n")
out_java_enum += (java_hu_subclasses)
return (out_java, out_java_enum, out_c)
- def map_opaque_struct(self, struct_name):
+ def map_opaque_struct(self, struct_name, struct_doc_comment):
implementations = ""
method_header = ""
if struct_name.startswith("LDKLocked"):
"""
return out_opaque_struct_human
- def map_function(self, argument_types, c_call_string, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, type_mapping_generator):
+ def map_function(self, argument_types, c_call_string, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, takes_self_as_ref, args_known, type_mapping_generator, doc_comment):
out_java = ""
out_c = ""
out_java_struct = None
elif info.from_hu_conv is not None and info.from_hu_conv[1] != "":
if not takes_self and return_type_info.to_hu_conv_name is not None:
out_java_struct += (
- "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name) + ";\n")
+ "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name).replace("\n", "\n\t\t") + ";\n")
else:
- out_java_struct += ("\t\t" + info.from_hu_conv[1] + ";\n")
+ out_java_struct += ("\t\t" + info.from_hu_conv[1].replace("\n", "\n\t\t") + ";\n")
if return_type_info.to_hu_conv_name is not None:
out_java_struct += ("\t\treturn " + return_type_info.to_hu_conv_name + ";\n")