Make String types language-specific and fix TS string conversion

[ldk-java] / gen_type_mapping.py

diff --git a/gen_type_mapping.py b/gen_type_mapping.py
index c7f75484daa660529eb9b4bb7da81806e577d7d0..b285ab34477554b4f60f3822b7b6093bd444ded0 100644 (file)
--- a/gen_type_mapping.py
+++ b/gen_type_mapping.py
@@ -200,7 +200,7 @@ class TypeMappingGenerator:
                 return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                     arg_conv = arg_conv, arg_conv_name = arg_conv_name, arg_conv_cleanup = arg_conv_cleanup,
                     ret_conv = ret_conv, ret_conv_name = arr_name + "_arr", to_hu_conv = to_hu_conv, to_hu_conv_name = to_hu_conv_name, from_hu_conv = from_hu_conv)
-        elif ty_info.java_ty == "String":
+        elif ty_info.java_fn_ty_arg == "Ljava/lang/String;":
             assert not is_nullable
             if not is_free:
                 arg_conv = "LDKStr " + ty_info.var_name + "_conv = " + self.consts.str_ref_to_c_call(ty_info.var_name) + ";"
@@ -209,6 +209,7 @@ class TypeMappingGenerator:
                 arg_conv = "LDKStr dummy = { .chars = NULL, .len = 0, .chars_is_owned = false };"
                 arg_conv_name = "dummy"
             if ty_info.arr_access is None:
+                assert False
                 return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                     arg_conv = arg_conv, arg_conv_name = arg_conv_name, arg_conv_cleanup = None,
                     ret_conv = ("const char* " + ty_info.var_name + "_str = ",
@@ -219,11 +220,17 @@ class TypeMappingGenerator:
                 free_str = ""
                 if not holds_ref:
                     free_str = "\nStr_free(" + ty_info.var_name + "_str);"
+                to_hu_conv = self.consts.str_to_hu_conv(ty_info.var_name)
+                to_hu_conv_name = None
+                if to_hu_conv is not None:
+                    to_hu_conv_name = ty_info.var_name + "_conv"
                 return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                     arg_conv = arg_conv, arg_conv_name = arg_conv_name, arg_conv_cleanup = None,
                     ret_conv = ("LDKStr " + ty_info.var_name + "_str = ",
                         ";\njstring " + ty_info.var_name + "_conv = " + self.consts.str_ref_to_native_call(ty_info.var_name + "_str." + ty_info.arr_access, ty_info.var_name + "_str." + ty_info.arr_len) + ";" + free_str),
-                    ret_conv_name = ty_info.var_name + "_conv", to_hu_conv = None, to_hu_conv_name = None, from_hu_conv = None)
+                    ret_conv_name = ty_info.var_name + "_conv",
+                    to_hu_conv=to_hu_conv, to_hu_conv_name=to_hu_conv_name,
+                    from_hu_conv = self.consts.str_from_hu_conv(ty_info.var_name))
         elif ty_info.var_name == "" and not print_void:
             # We don't have a parameter name, and want one, just call it arg
             if not ty_info.is_native_primitive: