X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=9441a2ac8bdad224c55d8b0f73fb298e0d5a514a;hb=f5ee93299299c74561e55f96ee7a267d8c4f7bc2;hp=1715a54dc46ca29b5c9d1f18c104f83ecc824684;hpb=d9ed706607bc61a1f7616724113876575fd9db43;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index 1715a54d..9441a2ac 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -11,21 +11,21 @@ class Target(Enum): BROWSER = 2 class Consts: - def __init__(self, DEBUG: bool, target: Target, **kwargs): - + def __init__(self, DEBUG: bool, target: Target, outdir: str, **kwargs): + self.outdir = outdir self.c_type_map = dict( uint8_t = ['number', 'Uint8Array'], uint16_t = ['number', 'Uint16Array'], uint32_t = ['number', 'Uint32Array'], - long = ['number'], + uint64_t = ['number'], ) self.wasm_decoding_map = dict( - int8_tArray = 'decodeArray' + int8_tArray = 'decodeUint8Array' ) self.wasm_encoding_map = dict( - int8_tArray = 'encodeArray', + int8_tArray = 'encodeUint8Array', ) self.to_hu_conv_templates = dict( @@ -39,8 +39,8 @@ export class VecOrSliceDef { public datalen: number; public stride: number; public constructor(dataptr: number, datalen: number, stride: number) { - this.dataptr = dataptr; - this.datalen = datalen; + this.dataptr = dataptr; + this.datalen = datalen; this.stride = stride; } } @@ -71,16 +71,12 @@ public static native long new_empty_slice_vec(); """ - self.bindings_footer = """ - export async function initializeWasm(allowDoubleInitialization: boolean = false): Promise { - if(isWasmInitialized && !allowDoubleInitialization) { - return; - } - const wasmInstance = await WebAssembly.instantiate(wasmModule, imports) - wasm = wasmInstance.exports; - isWasmInitialized = true; - } - """ + self.bindings_version_file = "" + + self.bindings_footer = "" + + self.util_fn_pfx = "" + self.util_fn_sfx = "" self.common_base = """ export default class CommonBase { @@ -92,9 +88,9 @@ public static native long new_empty_slice_vec(); // TODO: finalize myself } } - """ +""" - self.c_file_pfx = """#include + self.c_file_pfx = """#include "js-wasm.h" #include #include @@ -104,7 +100,9 @@ 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); +static inline void assert(bool expression) { + if (!expression) { abort(); } +} """ if not DEBUG: @@ -113,9 +111,11 @@ void *malloc(size_t size); void free(void *ptr); #define MALLOC(a, _) malloc(a) -#define FREE(p) if ((long)(p) > 1024) { free(p); } +#define FREE(p) if ((unsigned long)(p) > 4096) { free(p); } #define DO_ASSERT(a) (void)(a) #define CHECK(a) +#define CHECK_ACCESS(p) +#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v) """ else: self.c_file_pfx = self.c_file_pfx + """ @@ -167,11 +167,28 @@ static void alloc_freed(void* ptr) { __real_free(it); } static void FREE(void* ptr) { - if ((long)ptr < 1024) return; // Rust loves to create pointers to the NULL page for dummys + if ((unsigned long)ptr <= 4096) return; // Rust loves to create pointers to the NULL page for dummys alloc_freed(ptr); __real_free(ptr); } +static void CHECK_ACCESS(const void* ptr) { + allocation* it = allocation_ll; + while (it->ptr != ptr) { + it = it->next; + if (it == NULL) { + return; // addrsan should catch malloc-unknown and print more info than we have + } + } +} +#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v) \\ + if (v.is_owned && v.inner != NULL) { \\ + const void *p = __unmangle_inner_ptr(v.inner); \\ + if (p != NULL) { \\ + CHECK_ACCESS(p); \\ + } \\ + } + void* __wrap_malloc(size_t len) { void* res = __real_malloc(len); new_allocation(res, "malloc call"); @@ -215,73 +232,115 @@ _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; +#define DECL_ARR_TYPE(ty, name) \\ + struct name##array { \\ + uint32_t arr_len; \\ + ty elems[]; \\ + }; \\ + typedef struct name##array * name##Array; \\ + static inline name##Array init_##name##Array(size_t arr_len) { \\ + name##Array arr = (name##Array)MALLOC(arr_len * sizeof(ty) + sizeof(uint32_t), "##name array init"); \\ + arr->arr_len = arr_len; \\ + return arr; \\ + } + +DECL_ARR_TYPE(int64_t, int64_t); +DECL_ARR_TYPE(int8_t, int8_t); +DECL_ARR_TYPE(uint32_t, uint32_t); +DECL_ARR_TYPE(void*, ptr); +DECL_ARR_TYPE(char, char); +typedef charArray jstring; + +static inline jstring str_ref_to_ts(const char* chars, size_t len) { + charArray arr = init_charArray(len); + memcpy(arr->elems, chars, len); + return arr; +} +static inline LDKStr str_ref_to_owned_c(const jstring str) { + char* newchars = MALLOC(str->arr_len + 1, "String chars"); + memcpy(newchars, str->elems, str->arr_len); + newchars[str->arr_len] = 0; + LDKStr res = { + .chars = newchars, + .len = str->arr_len, + .chars_is_owned = true + }; + return res; +} typedef bool jboolean; +uint32_t __attribute__((visibility("default"))) TS_malloc(uint32_t size) { + return (uint32_t)MALLOC(size, "JS-Called malloc"); +} +void __attribute__((visibility("default"))) TS_free(uint32_t ptr) { + FREE((void*)ptr); +} """ + self.c_version_file = "" + self.hu_struct_file_prefix = f""" import CommonBase from './CommonBase'; -import * as bindings from '../bindings' // TODO: figure out location +import * as bindings from '../bindings.mjs' """ self.c_fn_ty_pfx = "" - self.c_fn_name_pfx = "" - self.c_fn_args_pfx = "void* ctx_TODO" - self.file_ext = ".ts" + self.file_ext = ".mts" self.ptr_c_ty = "uint32_t" - self.ptr_native_ty = "number" # "uint32_t" + self.ptr_native_ty = "number" 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.ptr_arr = "ptrArray" + self.is_arr_some_check = ("", " != 0") + self.get_native_arr_len_call = ("", "->arr_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\") }" - elif ty_info.c_ty == "int64_tArray": - return "{ .len = " + arr_len + ", .ptr = MALLOC(" + arr_len + " * sizeof(int64_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\") }" - else: - print("Need to create arr!", ty_info.c_ty) - return ty_info.c_ty + if ty_info.c_ty == "ptrArray": + assert ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array") + return "init_" + ty_info.c_ty + "(" + arr_len + ")" 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 + "->elems, ", ", " + 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 + ")" - else: - return arr_name + ".ptr" + return "memcpy(" + dest_name + ", " + arr_name + "->elems, " + arr_len + ")" + if ty_info.c_ty == "ptrArray": + return "(void*) " + arr_name + "->elems" else: - return "(" + ty_info.subty.c_ty + "*) " + arr_name + ".ptr" + assert not copy + return arr_name + "->elems" 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 + "*)(", " + 4)" + return "(" + ty_info.c_ty + "*)(", " + 4)" + 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 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 wasm_import_header(self, target): - if target == Target.NODEJS: - return """ - -import * as fs from 'fs'; -const source = fs.readFileSync('./ldk.wasm'); + def c_fn_name_define_pfx(self, fn_name, have_args): + return " __attribute__((visibility(\"default\"))) TS_" + fn_name + "(" + def wasm_import_header(self, target): + res = """ +function freer(f: () => void) { f() } +const finalizer = new FinalizationRegistry(freer); const memory = new WebAssembly.Memory({initial: 256}); -const wasmModule = new WebAssembly.Module(source); const imports: any = {}; imports.env = {}; @@ -292,121 +351,193 @@ imports.env.tableBase = 0; imports.env.table = new WebAssembly.Table({initial: 4, element: 'anyfunc'}); imports.env["abort"] = function () { - console.error("ABORT"); + console.error("ABORT"); +}; +imports.env["js_invoke_function"] = function(fn: number, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: number, arg7: number, arg8: number, arg9: number, arg10: number) { + console.log('function called from wasm:', fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); +}; +imports.env["js_free_function_ptr"] = function(fn: number) { + console.log("function ptr free'd from wasm:", fn); +}; + +imports.wasi_snapshot_preview1 = { + "fd_write" : () => { + console.log("ABORT"); + }, + "random_get" : () => { + console.log("RAND GET"); + }, + "environ_sizes_get" : () => { + console.log("wasi_snapshot_preview1:environ_sizes_get"); + }, + "proc_exit" : () => { + console.log("wasi_snapshot_preview1:proc_exit"); + }, + "environ_get" : () => { + console.log("wasi_snapshot_preview1:environ_get"); + }, }; -let wasm = null; +var wasm = null; let isWasmInitialized: boolean = false; +""" + + if target == Target.NODEJS: + res += """import * as fs from 'fs'; +export async function initializeWasm(path) { + const source = fs.readFileSync(path); + const { instance: wasmInstance } = await WebAssembly.instantiate(source, imports); + wasm = wasmInstance.exports; + isWasmInitialized = true; +}; +""" + else: + res += """ +export async function initializeWasm(uri) { + const stream = fetch(uri); + const { instance: wasmInstance } = await WebAssembly.instantiateStreaming(stream, imports); + wasm = wasmInstance.exports; + isWasmInitialized = true; +}; + +""" + + return res + """ // WASM CODEC const nextMultipleOfFour = (value: number) => { - return Math.ceil(value / 4) * 4; + return Math.ceil(value / 4) * 4; } -const encodeArray = (inputArray) => { - // TODO: (matt) is this correct, or should it go back to length * 4? - // const cArrayPointer = wasm.wasm_malloc(inputArray.length * 4); - const cArrayPointer = wasm.wasm_malloc(nextMultipleOfFour(inputArray.length)); +const encodeUint8Array = (inputArray) => { + const cArrayPointer = wasm.TS_malloc(inputArray.length + 4); + const arrayLengthView = new Uint32Array(memory.buffer, cArrayPointer, 1); + arrayLengthView[0] = inputArray.length; + const arrayMemoryView = new Uint8Array(memory.buffer, cArrayPointer + 4, inputArray.length); + arrayMemoryView.set(inputArray); + return cArrayPointer; +} - const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length); - arrayMemoryView.set(inputArray); - return cArrayPointer; +const encodeUint32Array = (inputArray) => { + const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 4); + const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length); + arrayMemoryView.set(inputArray, 1); + arrayMemoryView[0] = inputArray.length; + return cArrayPointer; } -const decodeArray = (arrayPointer, free = true) => { - const arraySizeViewer = new Uint32Array( - memory.buffer, // value - arrayPointer, // offset - 1 // one int - ); - const arraySize = arraySizeViewer[0]; - const actualArrayViewer = new Uint32Array( - memory.buffer, // value - arrayPointer, // offset - arraySize + 1 - ); - const actualArray = actualArrayViewer.slice(1, arraySize + 1); - if (free) { - // wasm.free_array(arrayPointer); - wasm.wasm_free(arrayPointer); // TODO: check if passing *void still captures remaining values - } - return actualArray; +const getArrayLength = (arrayPointer) => { + const arraySizeViewer = new Uint32Array( + memory.buffer, // value + arrayPointer, // offset + 1 // one int + ); + return arraySizeViewer[0]; +} +const decodeUint8Array = (arrayPointer, free = true) => { + const arraySize = getArrayLength(arrayPointer); + const actualArrayViewer = new Uint8Array( + memory.buffer, // value + arrayPointer + 4, // offset (ignoring length bytes) + arraySize // uint8 count + ); + // Clone the contents, TODO: In the future we should wrap the Viewer in a class that + // will free the underlying memory when it becomes unreachable instead of copying here. + const actualArray = actualArrayViewer.slice(0, arraySize); + if (free) { + wasm.TS_free(arrayPointer); + } + return actualArray; +} +const decodeUint32Array = (arrayPointer, free = true) => { + const arraySize = getArrayLength(arrayPointer); + const actualArrayViewer = new Uint32Array( + memory.buffer, // value + arrayPointer + 4, // offset (ignoring length bytes) + arraySize // uint32 count + ); + // Clone the contents, TODO: In the future we should wrap the Viewer in a class that + // will free the underlying memory when it becomes unreachable instead of copying here. + const actualArray = actualArrayViewer.slice(0, arraySize); + if (free) { + wasm.TS_free(arrayPointer); + } + return actualArray; } const encodeString = (string) => { - // make malloc count divisible by 4 - const memoryNeed = nextMultipleOfFour(string.length + 1); - const stringPointer = wasm.wasm_malloc(memoryNeed); - const stringMemoryView = new Uint8Array( - memory.buffer, // value - stringPointer, // offset - string.length + 1 // length - ); - for (let i = 0; i < string.length; i++) { - stringMemoryView[i] = string.charCodeAt(i); - } - stringMemoryView[string.length] = 0; - return stringPointer; + // make malloc count divisible by 4 + const memoryNeed = nextMultipleOfFour(string.length + 1); + const stringPointer = wasm.TS_malloc(memoryNeed); + const stringMemoryView = new Uint8Array( + memory.buffer, // value + stringPointer, // offset + string.length + 1 // length + ); + for (let i = 0; i < string.length; i++) { + stringMemoryView[i] = string.charCodeAt(i); + } + stringMemoryView[string.length] = 0; + return stringPointer; } const decodeString = (stringPointer, free = true) => { - const memoryView = new Uint8Array(memory.buffer, stringPointer); - let cursor = 0; - let result = ''; + const memoryView = new Uint8Array(memory.buffer, stringPointer); + let cursor = 0; + let result = ''; - while (memoryView[cursor] !== 0) { - result += String.fromCharCode(memoryView[cursor]); - cursor++; - } + while (memoryView[cursor] !== 0) { + result += String.fromCharCode(memoryView[cursor]); + cursor++; + } - if (free) { - wasm.wasm_free(stringPointer); - } + if (free) { + wasm.wasm_free(stringPointer); + } - return result; + return result; }; +""" - - """ - return '' - - def init_str(self, c_array_class_caches): + 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_typescript_enum_fields = "" - for var in variants: + for var, var_docs in variants: out_c = out_c + "\t\tcase %d: return %s;\n" % (ord_v, var) ord_v = ord_v + 1 + if var_docs is not None: + out_typescript_enum_fields += f"/**\n * {var_docs}\n */\n" out_typescript_enum_fields += f"{var},\n\t\t\t\t" out_c = out_c + "\t}\n" 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: + for var, _ in variants: out_c = out_c + "\t\tcase " + var + ": return %d;\n" % ord_v ord_v = ord_v + 1 out_c = out_c + "\t\tdefault: abort();\n" out_c = out_c + "\t}\n" out_c = out_c + "}\n" - out_typescript_enum = f""" + out_typescript = f""" export enum {struct_name} {{ {out_typescript_enum_fields} }} - """ - - return (out_c, out_typescript_enum, "") +""" + out_typescript_enum = f"export {{ {struct_name} }} from \"../bindings.mjs\";" + return (out_c, out_typescript_enum, out_typescript) def c_unitary_enum_to_native_call(self, ty_info): return (ty_info.rust_obj + "_to_js(", ")") @@ -422,14 +553,14 @@ const decodeString = (stringPointer, free = true) => { 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}" @@ -451,7 +582,7 @@ const decodeString = (stringPointer, free = true) => { 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} (" @@ -507,17 +638,26 @@ const decodeString = (stringPointer, free = true) => { 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} - + 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); @@ -529,43 +669,37 @@ const decodeString = (stringPointer, free = true) => { {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", "")}; }} - - """ - - +""" 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): @@ -578,7 +712,7 @@ const decodeString = (stringPointer, free = true) => { 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: @@ -587,20 +721,14 @@ const decodeString = (stringPointer, free = true) => { out_typescript_bindings += f"""): number {{ throw new Error('unimplemented'); // TODO: bind to WASM }} - - export function {struct_name}_get_obj_from_jcalls(val: number): {struct_name} {{ - throw new Error('unimplemented'); // TODO: bind to WASM - }} - """ +""" 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" - for var in field_var_conversions: + for var in flattened_field_var_conversions: if isinstance(var, ConvInfo): # We're a regular ol' field pass @@ -608,8 +736,8 @@ const decodeString = (stringPointer, free = true) => { # 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": - out_c = out_c + "\tjmethodID " + fn.fn_name + "_meth;\n" + 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" for fn_line in field_function_lines: @@ -617,16 +745,16 @@ const decodeString = (stringPointer, free = true) => { 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" + for fn in field_function_lines: + if fn.fn_name != "free" and fn.fn_name != "cloned": + out_c = out_c + "\t\tjs_free_function_ptr(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: @@ -637,8 +765,6 @@ const decodeString = (stringPointer, free = true) => { 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: @@ -646,19 +772,23 @@ const decodeString = (stringPointer, free = true) => { 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" 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 += "\t" + fn_line.ret_ty_info.c_ty + " ret = (" + fn_line.ret_ty_info.c_ty + ")" + out_c += "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 fn_line.ret_ty_info.java_ty == "String": + out_c = out_c + "\tjstring ret = (jstring)js_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 (*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 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 + "*)(*env)->CallLongMethod(env, obj, 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 + ", " + arg_info.ret_conv_name + out_c = out_c + ", (uint32_t)" + arg_info.ret_conv_name else: - out_c = out_c + ", " + arg_info.arg_name + out_c = out_c + ", (uint32_t)" + arg_info.arg_name out_c = out_c + ");\n" if fn_line.ret_ty_info.arg_conv is not None: out_c = out_c + "\t" + fn_line.ret_ty_info.arg_conv.replace("\n", "\n\t") + "\n\treturn " + fn_line.ret_ty_info.arg_conv_name + ";\n" @@ -666,47 +796,43 @@ const decodeString = (stringPointer, free = true) => { 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 (" + self.c_fn_args_pfx + ", jobject o" - for var in field_var_conversions: + out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (/*TODO: JS Object Reference */void* o" + 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 + ", 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": + 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: @@ -716,24 +842,30 @@ const decodeString = (stringPointer, free = true) => { 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 += "\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_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", jobject o" - for var in field_var_conversions: + 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 flattened_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" - for var in field_var_conversions: + out_c = out_c + "\t*res_ptr = " + struct_name + "_init(o" + for var in flattened_field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.arg_name else: @@ -742,16 +874,12 @@ const decodeString = (stringPointer, free = true) => { 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) - def map_complex_enum(self, struct_name, variant_list, camel_to_snake): + def trait_struct_inc_refcnt(self, ty_info): + return "" + + 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 = "" @@ -769,18 +897,17 @@ const decodeString = (stringPointer, free = true) => { out_java_enum += (f"\t\tconst raw_val: bindings.{struct_name} = bindings." + struct_name + "_ref_from_ptr(ptr);\n") java_hu_subclasses = "" - out_java += ("\tpublic static class " + struct_name + " {\n") - out_java += ("\t\tprivate " + struct_name + "() {}\n") + out_java += "\texport class " + struct_name + " {\n" + out_java += "\t\tprotected constructor() {}\n" + java_subclasses = "" for var in variant_list: - out_java += ("\t\texport class " + var.var_name + " extends " + struct_name + " {\n") + java_subclasses += "\texport class " + struct_name + "_" + var.var_name + " extends " + struct_name + " {\n" java_hu_subclasses = java_hu_subclasses + "export class " + var.var_name + " extends " + java_hu_type + " {\n" out_java_enum += ("\t\tif (raw_val instanceof bindings." + struct_name + "." + var.var_name + ") {\n") out_java_enum += ("\t\t\treturn new " + var.var_name + "(this.ptr, raw_val);\n") init_meth_params = "" - init_meth_body = "" hu_conv_body = "" - for idx, field_ty in enumerate(var.fields): - out_java += ("\t\t\tpublic " + field_ty.java_ty + " " + field_ty.arg_name + ";\n") + for idx, (field_ty, field_docs) in enumerate(var.fields): 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: hu_conv_body = hu_conv_body + "\t\tconst " + field_ty.arg_name + f": {field_ty.java_ty} = obj." + field_ty.arg_name + ";\n" @@ -789,37 +916,39 @@ const decodeString = (stringPointer, free = true) => { else: hu_conv_body = hu_conv_body + "\t\tthis." + field_ty.arg_name + " = obj." + field_ty.arg_name + ";\n" if idx > 0: - init_meth_params = init_meth_params + ", " - init_meth_params = init_meth_params + field_ty.java_ty + " " + field_ty.arg_name - init_meth_body = init_meth_body + "this." + field_ty.arg_name + " = " + field_ty.arg_name + "; " - out_java += ("\t\t\t" + var.var_name + "(" + init_meth_params + ") { ") - out_java += (init_meth_body) - out_java += ("}\n") - out_java += ("\t\t}\n") + init_meth_params += ", " + init_meth_params += "public " + field_ty.arg_name + ": " + field_ty.java_ty + java_subclasses += "\t\tconstructor(" + init_meth_params + ") { super(); }\n" + java_subclasses += "\t}\n" out_java_enum += ("\t\t}\n") java_hu_subclasses = java_hu_subclasses + "\tprivate constructor(ptr: number, obj: bindings." + struct_name + "." + var.var_name + ") {\n\t\tsuper(null, ptr);\n" java_hu_subclasses = java_hu_subclasses + hu_conv_body java_hu_subclasses = java_hu_subclasses + "\t}\n}\n" - out_java += ("\t\tstatic native void init();\n") out_java += ("\t}\n") + out_java += java_subclasses out_java_enum += ("\t\tthrow new Error('oops, this should be unreachable'); // Unreachable without extending the (internal) bindings interface\n\t}\n\n") - out_java += ("\tstatic { " + struct_name + ".init(); }\n") - out_java += ("\tpublic static native " + struct_name + " " + struct_name + "_ref_from_ptr(long ptr);\n"); + out_java += self.fn_call_body(struct_name + "_ref_from_ptr", "uint32_t", "number", "ptr: number", "ptr") - out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + " " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1ref_1from_1ptr (" + self.c_fn_args_pfx + ", " + self.ptr_c_ty + " ptr) {\n") - out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)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 & ~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") @@ -828,50 +957,70 @@ const decodeString = (stringPointer, free = true) => { 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"): 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 - def map_function(self, argument_types, c_call_string, is_free, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, has_out_java_struct: bool, type_mapping_generator): + def map_tuple(self, struct_name): + return self.map_opaque_struct(struct_name, "A Tuple") + + def fn_call_body(self, method_name, return_c_ty, return_java_ty, method_argument_string, native_call_argument_string): + has_return_value = return_c_ty != 'void' + needs_decoding = return_c_ty in self.wasm_decoding_map + return_statement = 'return nativeResponseValue;' + if not has_return_value: + return_statement = '// debug statements here' + elif needs_decoding: + converter = self.wasm_decoding_map[return_c_ty] + return_statement = f"return {converter}(nativeResponseValue);" + + return f"""\texport function {method_name}({method_argument_string}): {return_java_ty} {{ + if(!isWasmInitialized) {{ + throw new Error("initializeWasm() must be awaited first!"); + }} + const nativeResponseValue = wasm.TS_{method_name}({native_call_argument_string}); + {return_statement} + }} +""" + def map_function(self, argument_types, c_call_string, method_name, meth_n, 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 - out_java += ("\tpublic static native ") + out_java += ("\t") out_c += (self.c_fn_ty_pfx) out_c += (return_type_info.c_ty) out_java += (return_type_info.java_ty) if return_type_info.ret_conv is not None: ret_conv_pfx, ret_conv_sfx = return_type_info.ret_conv out_java += (" " + method_name + "(") - out_c += (" " + self.c_fn_name_pfx + method_name.replace('_', '_1') + "(" + self.c_fn_args_pfx) + out_c += (" " + self.c_fn_name_define_pfx(method_name, True)) method_argument_string = "" native_call_argument_string = "" @@ -879,7 +1028,6 @@ const decodeString = (stringPointer, free = true) => { if idx != 0: method_argument_string += (", ") native_call_argument_string += ', ' - if arg_conv_info.c_ty != "void": out_c += (", ") if arg_conv_info.c_ty != "void": out_c += (arg_conv_info.c_ty + " " + arg_conv_info.arg_name) @@ -890,51 +1038,32 @@ const decodeString = (stringPointer, free = true) => { native_argument = f"{converter}({arg_conv_info.arg_name})" method_argument_string += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}" native_call_argument_string += native_argument + out_java = self.fn_call_body(method_name, return_type_info.c_ty, return_type_info.java_ty, method_argument_string, native_call_argument_string) - needs_decoding = return_type_info.c_ty in self.wasm_decoding_map - return_value = 'nativeResponseValue' - if needs_decoding: - converter = self.wasm_decoding_map[return_type_info.c_ty] - return_value = f"{converter}(nativeResponseValue)" - - out_java = f"""\texport function {method_name}({method_argument_string}): {return_type_info.java_ty} {{ - if(!isWasmInitialized){{ - throw new Error("initializeWasm() must be awaited first!"); - }} - const nativeResponseValue = wasm.{method_name}({native_call_argument_string}); - return {return_value}; - \n\t}} - \n""" - - - - if has_out_java_struct: - out_java_struct = "" - if not args_known: - out_java_struct += ("\t// Skipped " + method_name + "\n") - has_out_java_struct = False + out_java_struct = "" + if not args_known: + out_java_struct += ("\t// Skipped " + method_name + "\n") + else: + if not takes_self: + out_java_struct += ( + "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(") else: - meth_n = method_name[len(struct_meth) + 1:] - if not takes_self: - out_java_struct += ( - "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(") - else: - out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") - for idx, arg in enumerate(argument_types): - if idx != 0: - if not takes_self or idx > 1: - out_java_struct += (", ") - elif takes_self: - continue - if arg.java_ty != "void": - if arg.arg_name in default_constructor_args: - for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]): - if explode_idx != 0: - out_java_struct += (", ") - out_java_struct += ( - explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name) - else: - out_java_struct += (arg.java_hu_ty + " " + arg.arg_name) + out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") + for idx, arg in enumerate(argument_types): + if idx != 0: + if not takes_self or idx > 1: + out_java_struct += (", ") + elif takes_self: + continue + if arg.java_ty != "void": + if arg.arg_name in default_constructor_args: + for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]): + if explode_idx != 0: + out_java_struct += (", ") + out_java_struct += ( + explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name) + else: + out_java_struct += (arg.java_hu_ty + " " + arg.arg_name) out_c += (") {\n") if out_java_struct is not None: @@ -973,7 +1102,7 @@ const decodeString = (stringPointer, free = true) => { out_c += ("\n\treturn ret_val;") out_c += ("\n}\n\n") - if has_out_java_struct: + if args_known: out_java_struct += ("\t\t") if return_type_info.java_ty != "void": out_java_struct += (return_type_info.java_ty + " ret = ") @@ -1020,9 +1149,9 @@ const decodeString = (stringPointer, free = true) => { 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") @@ -1031,3 +1160,6 @@ const decodeString = (stringPointer, free = true) => { out_java_struct += ("\t}\n\n") return (out_java, out_c, out_java_struct) + + def cleanup(self): + pass