X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=eb8d36b9b1876fe293fb764a157c6253960fba95;hb=2763e994504bf9e7fb46cfa060ec7d167226a80b;hp=f687f12568e4be158c97ca25169b617b9b39cb03;hpb=87edea7d57517740751cd325c61f121283342d32;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index f687f125..eb8d36b9 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -1,21 +1,68 @@ from bindingstypes import ConvInfo - +from enum import Enum def first_to_lower(string: str) -> str: first = string[0] return first.lower() + string[1:] +class Target(Enum): + NODEJS = 1, + BROWSER = 2 + class Consts: - def __init__(self, DEBUG): + def __init__(self, DEBUG: bool, target: Target, **kwargs): self.c_type_map = dict( uint8_t = ['number', 'Uint8Array'], uint16_t = ['number', 'Uint16Array'], uint32_t = ['number', 'Uint32Array'], - long = ['number'], + uint64_t = ['number'], + ) + + self.to_hu_conv_templates = dict( + ptr = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});', + default = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});', ) + self.bindings_header = self.wasm_import_header(target) + """ +export class VecOrSliceDef { + public dataptr: number; + public datalen: number; + public stride: number; + public constructor(dataptr: number, datalen: number, stride: number) { + this.dataptr = dataptr; + this.datalen = datalen; + this.stride = stride; + } +} + +/* +TODO: load WASM file +static { + System.loadLibrary(\"lightningjni\"); + init(java.lang.Enum.class, VecOrSliceDef.class); + init_class_cache(); +} + +static native void init(java.lang.Class c, java.lang.Class slicedef); +static native void init_class_cache(); + +public static native boolean deref_bool(long ptr); +public static native long deref_long(long ptr); +public static native void free_heap_ptr(long ptr); +public static native byte[] read_bytes(long ptr, long len); +public static native byte[] get_u8_slice_bytes(long slice_ptr); +public static native long bytes_to_u8_vec(byte[] bytes); +public static native long new_txpointer_copy_data(byte[] txdata); +public static native void txpointer_free(long ptr); +public static native byte[] txpointer_get_buffer(long ptr); +public static native long vec_slice_len(long vec); +public static native long new_empty_slice_vec(); +*/ + +""" + self.common_base = """ export default class CommonBase { ptr: number; @@ -26,9 +73,10 @@ class Consts: // TODO: finalize myself } } - """ +""" self.c_file_pfx = """#include +#include "js-wasm.h" #include #include @@ -38,7 +86,7 @@ void *memcpy(void *dest, const void *src, size_t n); int memcmp(const void *s1, const void *s2, size_t n); void __attribute__((noreturn)) abort(void); -void assert(scalar expression); +void assert(bool expression); """ if not DEBUG: @@ -149,9 +197,13 @@ _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); -typedef struct int64_tArray {uint32_t len;int64_t *ptr;} int64_tArray; -typedef struct uint32_tArray {uint32_t len;int32_t *ptr;} uint32_tArray; -typedef struct int8_tArray {uint32_t len;int8_t *ptr;} int8_tArray; +typedef struct int64_tArray { uint32_t *len; /* len + 1 is data */ } int64_tArray; +typedef struct uint32_tArray { uint32_t *len; /* len + 1 is data */ } uint32_tArray; +typedef struct ptrArray { uint32_t *len; /* len + 1 is data */ } ptrArray; +typedef struct int8_tArray { uint32_t *len; /* len + 1 is data */ } int8_tArray; +typedef struct jstring {} jstring; + +jstring conv_owned_string(const char* _src) { jstring a; return a; } typedef bool jboolean; @@ -167,46 +219,73 @@ import * as bindings from '../bindings' // TODO: figure out location self.c_fn_args_pfx = "void* ctx_TODO" self.file_ext = ".ts" self.ptr_c_ty = "uint32_t" - self.ptr_native_ty = "uint32_t" + self.ptr_native_ty = "number" # "uint32_t" self.result_c_ty = "uint32_t" - self.ptr_arr = "uint32_tArray" - self.get_native_arr_len_call = ("", ".len") - self.get_native_arr_ptr_call = ("", ".ptr") + self.owned_str_to_c_call = ("conv_owned_string(", ")") + self.ptr_arr = "ptrArray" + self.get_native_arr_len_call = ("*", ".len") - def release_native_arr_ptr_call(self, arr_var, arr_ptr_var): + def release_native_arr_ptr_call(self, ty_info, arr_var, arr_ptr_var): return None def create_native_arr_call(self, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": - return "{ .len = " + arr_len + ", .ptr = MALLOC(" + arr_len + ", \"Native " + ty_info.c_ty + " Bytes\") }" + return "{ .len = MALLOC(" + arr_len + " + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" elif ty_info.c_ty == "int64_tArray": - return "{ .len = " + arr_len + ", .ptr = MALLOC(" + arr_len + " * sizeof(int64_t), \"Native " + ty_info.c_ty + " Bytes\") }" + return "{ .len = MALLOC(" + arr_len + " * sizeof(int64_t) + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" elif ty_info.c_ty == "uint32_tArray": - return "{ .len = " + arr_len + ", .ptr = MALLOC(" + arr_len + " * sizeof(int32_t), \"Native " + ty_info.c_ty + " Bytes\") }" + return "{ .len = MALLOC(" + arr_len + " * sizeof(int32_t) + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" + elif ty_info.c_ty == "ptrArray": + assert ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array") + return "{ .len = MALLOC(" + arr_len + " * sizeof(int32_t) + sizeof(uint32_t), \"Native Object Bytes\") }" else: print("Need to create arr!", ty_info.c_ty) return ty_info.c_ty def set_native_arr_contents(self, arr_name, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": - return ("memcpy(" + arr_name + ".ptr, ", ", " + arr_len + ")") + return ("memcpy(" + arr_name + ".len + 1, ", ", " + arr_len + ")") else: assert False def get_native_arr_contents(self, arr_name, dest_name, arr_len, ty_info, copy): if ty_info.c_ty == "int8_tArray": if copy: - return "memcpy(" + dest_name + ", " + arr_name + ".ptr, " + arr_len + ")" + return "memcpy(" + dest_name + ", " + arr_name + ".len + 1, " + arr_len + ")" else: - return arr_name + ".ptr" + return "(int8_t*)(" + arr_name + ".len + 1)" else: - return "(" + ty_info.subty.c_ty + "*) " + arr_name + ".ptr" + return "(" + ty_info.subty.c_ty + "*)(" + arr_name + ".len + 1)" def get_native_arr_elem(self, arr_name, idxc, ty_info): assert False # Only called if above is None + def get_native_arr_ptr_call(self, ty_info): + if ty_info.subty is not None: + return "(" + ty_info.subty.c_ty + "*)(", ".len + 1)" + return "(" + ty_info.c_ty + "*)(", ".len + 1)" + def get_native_arr_entry_call(self, ty_info, arr_name, idxc, entry_access): + return None def cleanup_native_arr_ref_contents(self, arr_name, dest_name, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": return None else: return None - def init_str(self, c_array_class_caches): + + def wasm_import_header(self, target): + if target == Target.NODEJS: + return """ +const path = require('path').join(__dirname, 'bindings.wasm'); +const bytes = require('fs').readFileSync(path); +let imports = {}; +// add all exports to dictionary and move down? +// use `module.exports`? +// imports['./bindings.js'] = require('./bindings.js'); + +const wasmModule = new WebAssembly.Module(bytes); +const wasmInstance = new WebAssembly.Instance(wasmModule, imports); +// module.exports = wasmInstance.exports; +const wasm = wasmInstance.exports; +""" + return '' + + def init_str(self): return "" def native_c_unitary_enum_map(self, struct_name, variants): @@ -238,7 +317,7 @@ import * as bindings from '../bindings' // TODO: figure out location export enum {struct_name} {{ {out_typescript_enum_fields} }} - """ +""" return (out_c, out_typescript_enum, "") @@ -257,20 +336,16 @@ import * as bindings from '../bindings' // TODO: figure out location return ret def native_c_map_trait(self, struct_name, field_var_conversions, field_function_lines): - out_java = "out_java:native_c_map_trait" - out_java_trait = "out_java_trait:native_c_map_trait" - out_c = "out_c:native_c_map_trait" - - - out_java_trait = "" - out_java = "" + 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: 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}" if var.from_hu_conv is not None: super_instantiator += ", " + var.from_hu_conv[0] if var.from_hu_conv[1] != "": @@ -281,26 +356,79 @@ import * as bindings from '../bindings' // TODO: figure out location constructor_arguments += f", {first_to_lower(var[1])}?: bindings.{var[0]}" super_instantiator += ", " + first_to_lower(var[1]) pointer_to_adder += "this.ptrs_to.push(" + first_to_lower(var[1]) + ");\n" + impl_constructor_arguments += f", {first_to_lower(var[1])}_impl: {var[0].replace('LDK', '')}.{var[0].replace('LDK', '')}Interface" # BUILD INTERFACE METHODS out_java_interface = "" + out_interface_implementation_overrides = "" + java_methods = [] for fn_line in field_function_lines: + java_method_descriptor = "" if fn_line.fn_name != "free" and fn_line.fn_name != "clone": out_java_interface += fn_line.fn_name + "(" + out_interface_implementation_overrides += f"{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: out_java_interface += ", " + out_interface_implementation_overrides += ", " out_java_interface += f"{arg_conv_info.arg_name}: {arg_conv_info.java_hu_ty}" + out_interface_implementation_overrides += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}" + java_method_descriptor += arg_conv_info.java_fn_ty_arg out_java_interface += f"): {fn_line.ret_ty_info.java_hu_ty};\n\t\t\t\t" + java_method_descriptor += ")" + fn_line.ret_ty_info.java_fn_ty_arg + java_methods.append((fn_line.fn_name, java_method_descriptor)) + + out_interface_implementation_overrides += f"): {fn_line.ret_ty_info.java_ty} {{\n" + + interface_method_override_inset = "\t\t\t\t\t\t" + interface_implementation_inset = "\t\t\t\t\t\t\t" + for arg_info in fn_line.args_ty: + if arg_info.to_hu_conv is not None: + out_interface_implementation_overrides += interface_implementation_inset + arg_info.to_hu_conv.replace("\n", "\n\t\t\t\t") + "\n" + + if fn_line.ret_ty_info.java_ty != "void": + out_interface_implementation_overrides += interface_implementation_inset + fn_line.ret_ty_info.java_hu_ty + " ret = arg." + fn_line.fn_name + "(" + else: + out_interface_implementation_overrides += f"{interface_implementation_inset}arg." + fn_line.fn_name + "(" + + for idx, arg_info in enumerate(fn_line.args_ty): + if idx != 0: + out_interface_implementation_overrides += ", " + if arg_info.to_hu_conv_name is not None: + out_interface_implementation_overrides += arg_info.to_hu_conv_name + else: + out_interface_implementation_overrides += arg_info.arg_name + + out_interface_implementation_overrides += ");\n" + if fn_line.ret_ty_info.java_ty != "void": + if fn_line.ret_ty_info.from_hu_conv is not None: + out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\t" + f"result: {fn_line.ret_ty_info.java_ty} = " + fn_line.ret_ty_info.from_hu_conv[0] + ";\n" + if fn_line.ret_ty_info.from_hu_conv[1] != "": + out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held") + ";\n" + #if fn_line.ret_ty_info.rust_obj in result_types: + # XXX: We need to handle this in conversion logic so that its cross-language! + # Avoid double-free by breaking the result - we should learn to clone these and then we can be safe instead + # out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\tret.ptr = 0;\n" + out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\treturn result;\n" + else: + out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\treturn ret;\n" + out_interface_implementation_overrides += f"{interface_method_override_inset}}},\n\n{interface_method_override_inset}" + + trait_constructor_arguments = "" + for var in field_var_conversions: + if isinstance(var, ConvInfo): + trait_constructor_arguments += ", " + var.arg_name + else: + trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance" - out_java_trait = f""" + out_typescript_human = f""" {self.hu_struct_file_prefix} - + export class {struct_name.replace("LDK","")} extends CommonBase {{ - + bindings_instance?: bindings.{struct_name}; - + constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{ if (Number.isFinite(ptr)) {{ super(ptr); @@ -312,118 +440,66 @@ import * as bindings from '../bindings' // TODO: figure out location {pointer_to_adder} }} }} - + protected finalize() {{ - if (this.ptr != 0) {{ - bindings.{struct_name.replace("LDK","")}_free(this.ptr); - }} + if (this.ptr != 0) {{ + bindings.{struct_name.replace("LDK","")}_free(this.ptr); + }} super.finalize(); }} - + + static new_impl(arg: {struct_name.replace("LDK", "")}Interface{impl_constructor_arguments}): {struct_name.replace("LDK", "")} {{ + const impl_holder: {struct_name}Holder = new {struct_name}Holder(); + let structImplementation = {{ + // todo: in-line interface filling + {out_interface_implementation_overrides} + }}; + impl_holder.held = new {struct_name.replace("LDK", "")} (null, structImplementation{trait_constructor_arguments}); + }} }} - + export interface {struct_name.replace("LDK", "")}Interface {{ {out_java_interface} }} - """ - + class {struct_name}Holder {{ + held: {struct_name.replace("LDK", "")}; + }} +""" - java_trait_constr = "\tprivate static class " + struct_name + "Holder { " + struct_name.replace("LDK", "") + " held; }\n" - java_trait_constr = java_trait_constr + "\tpublic static " + struct_name.replace("LDK", "") + " new_impl(" + struct_name.replace("LDK", "") + "Interface arg" - for var in field_var_conversions: - if isinstance(var, ConvInfo): - java_trait_constr = java_trait_constr + ", " + var.java_hu_ty + " " + var.arg_name - else: - # Ideally we'd be able to take any instance of the interface, but our C code can only represent - # Java-implemented version, so we require users pass a Java implementation here :/ - java_trait_constr = java_trait_constr + ", " + var[0].replace("LDK", "") + "." + var[0].replace("LDK", "") + "Interface " + var[1] + "_impl" - java_trait_constr = java_trait_constr + ") {\n\t\tfinal " + struct_name + "Holder impl_holder = new " + struct_name + "Holder();\n" - java_trait_constr = java_trait_constr + "\t\timpl_holder.held = new " + struct_name.replace("LDK", "") + "(new bindings." + struct_name + "() {\n" - out_java_trait = out_java_trait + "\tpublic static interface " + struct_name.replace("LDK", "") + "Interface {\n" - out_java = out_java + "\tpublic interface " + struct_name + " {\n" + out_typescript_bindings += "\t\texport interface " + struct_name + " {\n" java_meths = [] for fn_line in field_function_lines: - java_meth_descr = "(" if fn_line.fn_name != "free" and fn_line.fn_name != "clone": - out_java = out_java + "\t\t " + fn_line.ret_ty_info.java_ty + " " + fn_line.fn_name + "(" - java_trait_constr = java_trait_constr + "\t\t\t@Override public " + fn_line.ret_ty_info.java_ty + " " + fn_line.fn_name + "(" - out_java_trait = out_java_trait + "\t\t" + fn_line.ret_ty_info.java_hu_ty + " " + fn_line.fn_name + "(" + out_typescript_bindings += f"\t\t\t{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: - out_java = out_java + ", " - java_trait_constr = java_trait_constr + ", " - out_java_trait = out_java_trait + ", " - out_java = out_java + arg_conv_info.java_ty + " " + arg_conv_info.arg_name - out_java_trait = out_java_trait + arg_conv_info.java_hu_ty + " " + arg_conv_info.arg_name - java_trait_constr = java_trait_constr + arg_conv_info.java_ty + " " + arg_conv_info.arg_name - java_meth_descr = java_meth_descr + arg_conv_info.java_fn_ty_arg - java_meth_descr = java_meth_descr + ")" + fn_line.ret_ty_info.java_fn_ty_arg - java_meths.append((fn_line.fn_name, java_meth_descr)) - - out_java = out_java + ");\n" - out_java_trait = out_java_trait + ");\n" - java_trait_constr = java_trait_constr + ") {\n" - - for arg_info in fn_line.args_ty: - if arg_info.to_hu_conv is not None: - java_trait_constr = java_trait_constr + "\t\t\t\t" + arg_info.to_hu_conv.replace("\n", "\n\t\t\t\t") + "\n" + out_typescript_bindings = out_typescript_bindings + ", " + out_typescript_bindings += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}" - if fn_line.ret_ty_info.java_ty != "void": - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.java_hu_ty + " ret = arg." + fn_line.fn_name + "(" - else: - java_trait_constr = java_trait_constr + "\t\t\t\targ." + fn_line.fn_name + "(" + out_typescript_bindings += f"): {fn_line.ret_ty_info.java_ty};\n" - for idx, arg_info in enumerate(fn_line.args_ty): - if idx != 0: - java_trait_constr = java_trait_constr + ", " - if arg_info.to_hu_conv_name is not None: - java_trait_constr = java_trait_constr + arg_info.to_hu_conv_name - else: - java_trait_constr = java_trait_constr + arg_info.arg_name + out_typescript_bindings = out_typescript_bindings + "\t\t}\n\n" - java_trait_constr = java_trait_constr + ");\n" - if fn_line.ret_ty_info.java_ty != "void": - if fn_line.ret_ty_info.from_hu_conv is not None: - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.java_ty + " result = " + fn_line.ret_ty_info.from_hu_conv[0] + ";\n" - if fn_line.ret_ty_info.from_hu_conv[1] != "": - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held") + ";\n" - #if fn_line.ret_ty_info.rust_obj in result_types: - # XXX: We need to handle this in conversion logic so that its cross-language! - # Avoid double-free by breaking the result - we should learn to clone these and then we can be safe instead - # java_trait_constr = java_trait_constr + "\t\t\t\tret.ptr = 0;\n" - java_trait_constr = java_trait_constr + "\t\t\t\treturn result;\n" - else: - java_trait_constr = java_trait_constr + "\t\t\t\treturn ret;\n" - java_trait_constr = java_trait_constr + "\t\t\t}\n" - java_trait_constr = java_trait_constr + "\t\t}" + out_typescript_bindings += f"\t\texport function {struct_name}_new(impl: {struct_name}" for var in field_var_conversions: if isinstance(var, ConvInfo): - java_trait_constr = java_trait_constr + ", " + var.arg_name + out_typescript_bindings += f", {var.arg_name}: {var.java_ty}" else: - java_trait_constr = java_trait_constr + ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance" - out_java_trait = out_java_trait + "\t}\n" - out_java_trait = out_java_trait + java_trait_constr + ");\n\t\treturn impl_holder.held;\n\t}\n" - - print(java_trait_constr) + out_typescript_bindings += f", {var[1]}: {var[0]}" - out_java = out_java + "\t}\n" + out_typescript_bindings += f"""): number {{ + throw new Error('unimplemented'); // TODO: bind to WASM + }} +""" - out_java = out_java + "\tpublic static native long " + struct_name + "_new(" + struct_name + " impl" - for var in field_var_conversions: - if isinstance(var, ConvInfo): - out_java = out_java + ", " + var.java_ty + " " + var.arg_name - else: - out_java = out_java + ", " + var[0] + " " + var[1] - out_java = out_java + ");\n" - out_java = out_java + "\tpublic static native " + struct_name + " " + struct_name + "_get_obj_from_jcalls(long val);\n" + out_typescript_bindings += '\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: END\n\n\n' # 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" - out_c = out_c + "\tJavaVM *vm;\n" - out_c = out_c + "\tjweak o;\n" + out_c = out_c + "\t// TODO: Object pointer o;\n" for var in field_var_conversions: if isinstance(var, ConvInfo): # We're a regular ol' field @@ -433,7 +509,7 @@ import * as bindings from '../bindings' // TODO: figure out location 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": - out_c = out_c + "\tjmethodID " + fn.fn_name + "_meth;\n" + out_c = out_c + "\t// TODO: Some kind of method pointer " + fn.fn_name + "_meth;\n" out_c = out_c + "} " + struct_name + "_JCalls;\n" for fn_line in field_function_lines: @@ -441,9 +517,7 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + "static void " + struct_name + "_JCalls_free(void* this_arg) {\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" - out_c = out_c + "\t\tJNIEnv *env;\n" - out_c = out_c + "\t\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n" - out_c = out_c + "\t\t(*env)->DeleteWeakGlobalRef(env, j_calls->o);\n" + out_c = out_c + "\t\t// TODO: do any release required for j_calls->o (refcnt-- in java, but may be redundant)\n" out_c = out_c + "\t\tFREE(j_calls);\n" out_c = out_c + "\t}\n}\n" @@ -461,8 +535,6 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + ") {\n" out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n" - out_c = out_c + "\tJNIEnv *env;\n" - out_c = out_c + "\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n" for arg_info in fn_line.args_ty: if arg_info.ret_conv is not None: @@ -470,13 +542,15 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + arg_info.arg_name out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n" - out_c = out_c + "\tjobject obj = (*env)->NewLocalRef(env, j_calls->o);\n\tCHECK(obj != NULL);\n" + out_c = out_c + "\t//TODO: jobject obj = get object we can call against on j_calls->o\n" if fn_line.ret_ty_info.c_ty.endswith("Array"): - out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg = (*env)->CallObjectMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth" + out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning an object" + elif fn_line.ret_ty_info.java_ty == "void": + out_c = out_c + "\treturn; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj" elif not fn_line.ret_ty_info.passed_as_ptr: - out_c = out_c + "\treturn (*env)->Call" + fn_line.ret_ty_info.java_ty.title() + "Method(env, obj, j_calls->" + fn_line.fn_name + "_meth" + out_c = out_c + "\treturn 0; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning " + fn_line.ret_ty_info.java_ty else: - out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret = (" + fn_line.ret_ty_info.rust_obj + "*)(*env)->CallLongMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth" + out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning a pointer" for idx, arg_info in enumerate(fn_line.args_ty): if arg_info.ret_conv is not None: @@ -499,20 +573,17 @@ import * as bindings from '../bindings' // TODO: figure out location 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 (" + self.c_fn_args_pfx + ", jobject o" + out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name else: - out_c = out_c + ", jobject " + var[1] + out_c = out_c + ", /*TODO: JS Object Reference */void* " + var[1] out_c = out_c + ") {\n" - out_c = out_c + "\tjclass c = (*env)->GetObjectClass(env, o);\n" - out_c = out_c + "\tCHECK(c != NULL);\n" out_c = out_c + "\t" + struct_name + "_JCalls *calls = MALLOC(sizeof(" + struct_name + "_JCalls), \"" + struct_name + "_JCalls\");\n" out_c = out_c + "\tatomic_init(&calls->refcnt, 1);\n" - out_c = out_c + "\tDO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);\n" - out_c = out_c + "\tcalls->o = (*env)->NewWeakGlobalRef(env, o);\n" + 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": @@ -540,7 +611,7 @@ import * as bindings from '../bindings' // TODO: figure out location 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(env, clz, " + var[1] + "),\n" + out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(NULL, " + var[1] + "),\n" out_c = out_c + "\t};\n" for var in field_var_conversions: if not isinstance(var, ConvInfo): @@ -548,15 +619,15 @@ import * as bindings from '../bindings' // TODO: figure out location 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_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", jobject o" + out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name else: - out_c = out_c + ", jobject " + var[1] + out_c = out_c + ", /*TODO: JS Object Reference */ void* " + var[1] 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(env, clz, o" + out_c = out_c + "\t*res_ptr = " + struct_name + "_init(NULL, o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.arg_name @@ -566,14 +637,10 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + "\treturn (long)res_ptr;\n" out_c = out_c + "}\n" - out_c = out_c + self.c_fn_ty_pfx + "jobject " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1get_1obj_1from_1jcalls (" + self.c_fn_args_pfx + ", " + self.ptr_c_ty + " val) {\n" - out_c = out_c + "\tjobject ret = (*env)->NewLocalRef(env, ((" + struct_name + "_JCalls*)val)->o);\n" - out_c = out_c + "\tCHECK(ret != NULL);\n" - out_c = out_c + "\treturn ret;\n" - out_c = out_c + "}\n" - + return (out_typescript_bindings, out_typescript_human, out_c) - return (out_java, out_java_trait, out_c) + def trait_struct_inc_refcnt(self, ty_info): + return "" def map_complex_enum(self, struct_name, variant_list, camel_to_snake): java_hu_type = struct_name.replace("LDK", "") @@ -651,3 +718,33 @@ import * as bindings from '../bindings' // TODO: figure out location out_java_enum += ("}\n") out_java_enum += (java_hu_subclasses) return (out_java, out_java_enum, out_c) + + def map_opaque_struct(self, struct_name): + implementations = "" + method_header = "" + if struct_name.startswith("LDKLocked"): + implementations += "implements AutoCloseable " + method_header = """ + public close() { +""" + else: + method_header = """ + protected finalize() { + super.finalize(); +""" + + out_opaque_struct_human = f""" + {self.hu_struct_file_prefix} + + export default class {struct_name.replace("LDK","")} extends CommonBase {implementations}{{ + constructor(_dummy: object, ptr: number) {{ + super(ptr); + }} + + {method_header} + if (this.ptr != 0) {{ + bindings.{struct_name.replace("LDK","")}_free(this.ptr); + }} + }} +""" + return out_opaque_struct_human