X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=d5d4499d91c7ad46228345a43b956578a3dbd925;hb=5f5d273d63baca66e94d6f34f485fc2398ee12f7;hp=a3c706ecafc98bf22eb893c41eeb8cf53fcd69db;hpb=51b99938ad39a1215696f57e37c8ee79307c1086;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index a3c706ec..d5d4499d 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -97,8 +97,7 @@ public static native long new_empty_slice_vec(); } """ - self.c_file_pfx = """#include -#include "js-wasm.h" + self.c_file_pfx = """#include "js-wasm.h" #include #include @@ -233,12 +232,24 @@ static inline uint32_t init_arr(size_t arr_len, size_t elem_size, const char *ty 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; @@ -305,8 +316,10 @@ import * as bindings from '../bindings' // TODO: figure out location 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 + "(" @@ -483,14 +496,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, trait_doc_comment): + 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}" @@ -568,7 +581,18 @@ 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} @@ -631,7 +655,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: @@ -647,7 +671,7 @@ const decodeString = (stringPointer, free = true) => { # 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 @@ -673,7 +697,7 @@ const decodeString = (stringPointer, free = true) => { for idx, fn_line in enumerate(field_function_lines): if fn_line.fn_name != "free" and fn_line.fn_name != "clone": 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: @@ -722,7 +746,7 @@ const decodeString = (stringPointer, free = true) => { 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: @@ -738,14 +762,14 @@ const decodeString = (stringPointer, free = true) => { 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" + 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: @@ -759,16 +783,22 @@ 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(" + 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: @@ -776,7 +806,7 @@ const decodeString = (stringPointer, free = true) => { 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: @@ -846,7 +876,7 @@ const decodeString = (stringPointer, free = true) => { 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") @@ -854,11 +884,17 @@ const decodeString = (stringPointer, free = true) => { 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") @@ -897,7 +933,7 @@ const decodeString = (stringPointer, free = true) => { """ 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, doc_comment): + 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