X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=java_strings.py;h=96d6909678ce7e58997f7866a4af65b0db8b40ef;hb=753d902bc977acbf08b3166f054673236c39c01b;hp=03a1d6e9084db6987861503760677ebb5aa03cf7;hpb=5c95cad6c8e9b710cbaaf273b639064e80b697dc;p=ldk-java diff --git a/java_strings.py b/java_strings.py index 03a1d6e9..96d69096 100644 --- a/java_strings.py +++ b/java_strings.py @@ -315,6 +315,20 @@ static inline jstring str_ref_to_java(JNIEnv *env, const char* chars, size_t len FREE(err_buf); return err_conv; } +static inline LDKStr java_to_owned_str(JNIEnv *env, jstring str) { + uint64_t str_len = (*env)->GetStringUTFLength(env, str); + char* newchars = MALLOC(str_len + 1, "String chars"); + const char* jchars = (*env)->GetStringUTFChars(env, str, NULL); + memcpy(newchars, jchars, str_len); + newchars[str_len] = 0; + (*env)->ReleaseStringUTFChars(env, str, jchars); + LDKStr res = { + .chars = newchars, + .len = str_len, + .chars_is_owned = true + }; + return res; +} """ self.hu_struct_file_prefix = """package org.ldk.structs; @@ -381,8 +395,10 @@ import java.util.Arrays; else: return "(*env)->Release" + ty_info.java_ty.strip("[]").title() + "ArrayElements(env, " + arr_name + ", " + dest_name + ", 0)" - 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_java(env, " + var_name + ", " + str_len + ")" + def str_ref_to_c_call(self, var_name): + return "java_to_owned_str(env, " + var_name + ")" def c_fn_name_define_pfx(self, fn_name, has_args): if has_args: @@ -479,7 +495,7 @@ import java.util.Arrays; ret = ret + ", " + param return ret + ")" - def native_c_map_trait(self, struct_name, field_vars, field_fns, trait_doc_comment): + def native_c_map_trait(self, struct_name, field_vars, flattened_field_vars, field_fns, trait_doc_comment): out_java_trait = "" out_java = "" @@ -492,14 +508,14 @@ import java.util.Arrays; out_java_trait = out_java_trait + "\tfinal bindings." + struct_name + " bindings_instance;\n" out_java_trait = out_java_trait + "\t" + struct_name.replace("LDK", "") + "(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }\n" out_java_trait = out_java_trait + "\tprivate " + struct_name.replace("LDK", "") + "(bindings." + struct_name + " arg" - for var in field_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): out_java_trait = out_java_trait + ", " + var.java_hu_ty + " " + var.arg_name else: out_java_trait = out_java_trait + ", bindings." + var[0] + " " + var[1] out_java_trait = out_java_trait + ") {\n" out_java_trait = out_java_trait + "\t\tsuper(bindings." + struct_name + "_new(arg" - for var in field_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): if var.from_hu_conv is not None: out_java_trait = out_java_trait + ", " + var.from_hu_conv[0] @@ -509,7 +525,7 @@ import java.util.Arrays; out_java_trait = out_java_trait + ", " + var[1] out_java_trait = out_java_trait + "));\n" out_java_trait = out_java_trait + "\t\tthis.ptrs_to.add(arg);\n" - for var in field_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): if var.from_hu_conv is not None and var.from_hu_conv[1] != "": out_java_trait = out_java_trait + "\t\t" + var.from_hu_conv[1].replace("\n", "\n\t\t") + ";\n" @@ -524,7 +540,7 @@ import java.util.Arrays; 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_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): java_trait_constr = java_trait_constr + ", " + var.java_hu_ty + " " + var.arg_name else: @@ -593,14 +609,25 @@ import java.util.Arrays; if isinstance(var, ConvInfo): java_trait_constr = java_trait_constr + ", " + var.arg_name else: - java_trait_constr = java_trait_constr + ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance" + java_trait_constr += ", " + var[1] + ".new_impl(" + var[1] + "_impl" + for suparg in var[2]: + if isinstance(suparg, ConvInfo): + java_trait_constr += ", " + suparg.arg_name + else: + java_trait_constr += ", " + suparg[1] + java_trait_constr += ").bindings_instance" + for suparg in var[2]: + if isinstance(suparg, ConvInfo): + java_trait_constr += ", " + suparg.arg_name + else: + java_trait_constr += ", " + suparg[1] 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" out_java = out_java + "\t}\n" out_java = out_java + "\tpublic static native long " + struct_name + "_new(" + struct_name + " impl" - for var in field_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): out_java = out_java + ", " + var.java_ty + " " + var.arg_name else: @@ -612,7 +639,7 @@ import java.util.Arrays; 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_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): # We're a regular ol' field pass @@ -688,7 +715,7 @@ import java.util.Arrays; 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_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name else: @@ -707,7 +734,7 @@ import java.util.Arrays; 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_vars: + for var in flattened_field_vars: 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" @@ -728,16 +755,22 @@ import java.util.Arrays; 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(env, clz, " + var[1] + for suparg in var[2]: + if isinstance(suparg, ConvInfo): + out_c = out_c + ", " + suparg.arg_name + else: + out_c = out_c + ", " + suparg[1] + out_c += "),\n" out_c = out_c + "\t};\n" - for var in field_vars: + for var in flattened_field_vars: 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 + "int64_t " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "jobject o" - for var in field_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name else: @@ -745,7 +778,7 @@ import java.util.Arrays; 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_vars: + for var in flattened_field_vars: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.arg_name else: