X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=gen_type_mapping.py;h=8dd7c6cafe452b09b52b91bb83ee91e6a3a5b446;hp=2ed6faa375f9d70ebbdbd985495a66e7c9dbc1a6;hb=a37d4e67b1ec6666ca9dfda060e4986aa82ee3da;hpb=2a8f98ff41670980cc9b542bbf6d76348e8ca7fa diff --git a/gen_type_mapping.py b/gen_type_mapping.py index 2ed6faa3..8dd7c6ca 100644 --- a/gen_type_mapping.py +++ b/gen_type_mapping.py @@ -187,8 +187,6 @@ class TypeMappingGenerator: if is_nullable: ret_conv = (ret_conv[0], ret_conv[1] + "\n}") - to_hu_conv = None - to_hu_conv_name = None 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")) @@ -200,6 +198,12 @@ class TypeMappingGenerator: 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") + 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) if subty.from_hu_conv is not None: hu_conv_b = ""