else:
arg_conv = arg_conv + arr_name + "_ref." + ty_info.arr_access + " = " + self.consts.get_native_arr_contents(arr_name, "NO_DEST", arr_name + "_ref." + arr_len, ty_info, False) + ";"
arg_conv_cleanup = self.consts.cleanup_native_arr_ref_contents(arr_name, arr_name + "_ref." + ty_info.arr_access, arr_name + "_ref." + arr_len, ty_info)
- if ty_info.rust_obj == "LDKTransaction":
+ if ty_info.rust_obj == "LDKTransaction" or ty_info.rust_obj == "LDKWitness":
arg_conv = arg_conv + "\n" + arr_name + "_ref.data_is_owned = " + str(holds_ref).lower() + ";"
ret_conv = (ty_info.rust_obj + " " + arr_name + "_var = ", "")
ret_conv = (ret_conv[0], ";\nint8_tArray " + arr_name + "_arr = " + self.consts.create_native_arr_call(arr_name + "_var." + arr_len, ty_info) + ";\n")
ret_conv = (ret_conv[0], ret_conv[1] + pfx + arr_name + "_var." + ty_info.arr_access + sfx + ";")
if not holds_ref and ty_info.rust_obj != "LDKu8slice":
ret_conv = (ret_conv[0], ret_conv[1] + "\n" + ty_info.rust_obj.replace("LDK", "") + "_free(" + arr_name + "_var);")
- from_hu_conv = self.consts.primitive_arr_from_hu(ty_info.subty, None, arr_name)
- to_hu_conv = self.consts.primitive_arr_to_hu(ty_info.subty, None, arr_name, arr_name + "_conv")
+ from_hu_conv = self.consts.primitive_arr_from_hu(ty_info, None, arr_name)
+ to_hu_conv = self.consts.primitive_arr_to_hu(ty_info, None, arr_name, arr_name + "_conv")
elif ty_info.rust_obj is not None:
arg_conv = ty_info.rust_obj + " " + arr_name + "_ref;\n"
arg_conv = arg_conv + "CHECK(" + self.consts.get_native_arr_len_call[0] + arr_name + self.consts.get_native_arr_len_call[1] + " == " + arr_len + ");\n"
arg_conv = arg_conv + self.consts.get_native_arr_contents(arr_name, arr_name + "_ref." + ty_info.arr_access, arr_len, ty_info, True) + ";"
ret_conv = (ret_conv[0], "." + ty_info.arr_access + set_sfx + ";")
- from_hu_conv = self.consts.primitive_arr_from_hu(ty_info.subty, arr_len, arr_name)
- to_hu_conv = self.consts.primitive_arr_to_hu(ty_info.subty, None, arr_name, arr_name + "_conv")
+ from_hu_conv = self.consts.primitive_arr_from_hu(ty_info, arr_len, arr_name)
+ to_hu_conv = self.consts.primitive_arr_to_hu(ty_info, None, arr_name, arr_name + "_conv")
else:
arg_conv = "unsigned char " + arr_name + "_arr[" + arr_len + "];\n"
arg_conv = arg_conv + "CHECK(" + self.consts.get_native_arr_len_call[0] + arr_name + self.consts.get_native_arr_len_call[1] + " == " + arr_len + ");\n"
arg_conv = arg_conv + self.consts.get_native_arr_contents(arr_name, arr_name + "_arr", arr_len, ty_info, True) + ";\n"
arg_conv = arg_conv + "unsigned char (*" + arr_name + "_ref)[" + arr_len + "] = &" + arr_name + "_arr;"
ret_conv = (ret_conv[0] + "*", set_sfx + ";")
- from_hu_conv = self.consts.primitive_arr_from_hu(ty_info.subty, arr_len, arr_name)
- to_hu_conv = self.consts.primitive_arr_to_hu(ty_info.subty, None, arr_name, arr_name + "_conv")
+ from_hu_conv = self.consts.primitive_arr_from_hu(ty_info, arr_len, arr_name)
+ to_hu_conv = self.consts.primitive_arr_to_hu(ty_info, None, arr_name, arr_name + "_conv")
to_hu_conv_name = None
if to_hu_conv is not None:
to_hu_conv_name = arr_name + "_conv"
if subty.to_hu_conv is not None:
to_hu_conv = self.consts.var_decl_statement(self.consts.c_type_map["uint32_t"][0], conv_name + "_len", self.consts.get_java_arr_len(arr_name)) + ";\n"
to_hu_conv += self.consts.var_decl_statement(ty_info.java_hu_ty, conv_name + "_arr", self.consts.constr_hu_array(ty_info, conv_name + "_len"))
- to_hu_conv += ";\n" + self.consts.for_n_in_range(idxc, "0", conv_name + "_len") + "\n"
- to_hu_conv += "\t" + self.consts.var_decl_statement(subty.java_ty, conv_name, self.consts.get_java_arr_elem(subty, arr_name, idxc)) + ";\n"
- to_hu_conv += "\t" + subty.to_hu_conv.replace("\n", "\n\t") + "\n"
- to_hu_conv += "\t" + conv_name + "_arr[" + idxc + "] = " + subty.to_hu_conv_name + ";\n}"
+ to_hu_conv += ";\n"
+ pfx = ""
+ if is_nullable:
+ to_hu_conv += "if (" + arr_name + " != null) {\n"
+ pfx = "\t"
+ to_hu_conv += pfx + self.consts.for_n_in_range(idxc, "0", conv_name + "_len") + "\n"
+
+ to_hu_conv += pfx + "\t" + self.consts.var_decl_statement(subty.java_ty, conv_name, self.consts.get_java_arr_elem(subty, arr_name, idxc)) + ";\n"
+ to_hu_conv += pfx + "\t" + subty.to_hu_conv.replace("\n", "\n\t" + pfx) + "\n"
+ to_hu_conv += pfx + "\t" + conv_name + "_arr[" + idxc + "] = " + subty.to_hu_conv_name + ";\n"
+ to_hu_conv += pfx + "}"
+ if is_nullable:
+ to_hu_conv += "\n}"
cleanup = self.consts.cleanup_converted_native_array(ty_info, arr_name)
if cleanup is not None:
to_hu_conv += "\n" + cleanup
to_hu_conv_name = conv_name + "_arr"
else:
- to_hu_conv = self.consts.primitive_arr_to_hu(ty_info.subty, None, arr_name, arr_name + "_conv")
+ to_hu_conv = self.consts.primitive_arr_to_hu(ty_info, None, arr_name, arr_name + "_conv")
if to_hu_conv is not None:
to_hu_conv_name = arr_name + "_conv"
else:
to_hu_conv_name = None
- from_hu_conv = self.consts.primitive_arr_from_hu(ty_info.subty, None, arr_name)
+ from_hu_conv = self.consts.primitive_arr_from_hu(ty_info, None, arr_name)
if subty.from_hu_conv is not None:
hu_conv_b = ""
if subty.from_hu_conv[1] != "":
iterator = self.consts.for_n_in_arr(conv_name, arr_name, subty)
- hu_conv_b = iterator[0] + subty.from_hu_conv[1] + ";" + iterator[1]
+ if is_nullable:
+ hu_conv_b = "if (" + arr_name + " != null) { " + iterator[0] + subty.from_hu_conv[1] + ";" + iterator[1] + " }"
+ else:
+ hu_conv_b = iterator[0] + subty.from_hu_conv[1] + ";" + iterator[1]
if from_hu_conv is not None:
- arr_conv = self.consts.primitive_arr_from_hu(ty_info.subty, None, self.consts.map_hu_array_elems(arr_name, conv_name, ty_info, subty))
+ arr_conv = self.consts.primitive_arr_from_hu(ty_info, None, self.consts.map_hu_array_elems(arr_name, conv_name, ty_info, subty))
assert arr_conv[1] == ""
from_hu_conv = (arr_conv[0], hu_conv_b)
else:
to_hu_conv = self.consts.var_decl_statement(ty_info.java_hu_ty, ty_info.var_name + "_hu_conv", "new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ")") + ";" + to_hu_conv_sfx,
to_hu_conv_name = ty_info.var_name + "_hu_conv", from_hu_conv = from_hu_conv)
- # The manually-defined types - TxOut, u5, and Error
+ # The manually-defined types - TxOut, BigEndianScalar, U5, and Error
if ty_info.rust_obj == "LDKError":
assert from_hu_conv is None
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
to_hu_conv = self.consts.var_decl_statement(ty_info.java_hu_ty, ty_info.var_name + "_conv", "new " + ty_info.java_hu_ty + "(" + ty_info.var_name + ")") + ";",
to_hu_conv_name = ty_info.var_name + "_conv", from_hu_conv = ("0", ""))
- if ty_info.rust_obj == "LDKu5" or ty_info.rust_obj == "LDKWitnessVersion":
+ if ty_info.rust_obj == "LDKU5" or ty_info.rust_obj == "LDKWitnessVersion":
assert from_hu_conv is None
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv = "", arg_conv_name = "(" + ty_info.rust_obj + "){ ._0 = " + ty_info.var_name + " }", arg_conv_cleanup = None,
to_hu_conv = self.consts.var_decl_statement(ty_info.java_hu_ty, ty_info.var_name + "_conv", "new " + ty_info.java_hu_ty + "(" + ty_info.var_name + ")") + ";",
to_hu_conv_name = ty_info.var_name + "_conv", from_hu_conv = (ty_info.var_name + ".getVal()", ""))
- assert ty_info.rust_obj == "LDKTxOut"
+ assert ty_info.rust_obj == "LDKTxOut" or ty_info.rust_obj == "LDKBigEndianScalar"
if not ty_info.is_ptr and not holds_ref:
- ret_conv = ("LDKTxOut* " + ty_info.var_name + "_ref = MALLOC(sizeof(LDKTxOut), \"LDKTxOut\");\n*" + ty_info.var_name + "_ref = ", ";")
+ ret_conv = (ty_info.rust_obj + "* " + ty_info.var_name + "_ref = MALLOC(sizeof(" + ty_info.rust_obj + "), \"" + ty_info.rust_obj + "\");\n*" + ty_info.var_name + "_ref = ", ";")
ret_conv_name = "tag_ptr(" + ty_info.var_name + "_ref, true)"
else:
- ret_conv = ("LDKTxOut* " + ty_info.var_name + "_ref = &", ";")
+ ret_conv = (ty_info.rust_obj + "* " + ty_info.var_name + "_ref = &", ";")
ret_conv_name = "tag_ptr(" + ty_info.var_name + "_ref, false)"
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv = base_conv, arg_conv_name = ty_info.var_name + "_conv", arg_conv_cleanup = None,
projects / ldk-java / blobdiff