}
"""
+ self.util_fn_pfx = ""
+ self.util_fn_sfx = ""
+
self.common_base = """
export default class CommonBase {
ptr: number;
"""
return out_opaque_struct_human
- def map_function(self, argument_types, c_call_string, is_free, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, has_out_java_struct: bool, type_mapping_generator):
+ 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):
out_java = ""
out_c = ""
out_java_struct = None
}}
"""
- if has_out_java_struct:
- out_java_struct = ""
- if not args_known:
- out_java_struct += ("\t// Skipped " + method_name + "\n")
- has_out_java_struct = False
+ out_java_struct = ""
+ if not args_known:
+ out_java_struct += ("\t// Skipped " + method_name + "\n")
+ else:
+ meth_n = method_name[len(struct_meth) + 1:]
+ if not takes_self:
+ out_java_struct += (
+ "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(")
else:
- meth_n = method_name[len(struct_meth) + 1:]
- if not takes_self:
- out_java_struct += (
- "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(")
- else:
- out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(")
- for idx, arg in enumerate(argument_types):
- if idx != 0:
- if not takes_self or idx > 1:
- out_java_struct += (", ")
- elif takes_self:
- continue
- if arg.java_ty != "void":
- if arg.arg_name in default_constructor_args:
- for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]):
- if explode_idx != 0:
- out_java_struct += (", ")
- out_java_struct += (
- explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name)
- else:
- out_java_struct += (arg.java_hu_ty + " " + arg.arg_name)
+ out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(")
+ for idx, arg in enumerate(argument_types):
+ if idx != 0:
+ if not takes_self or idx > 1:
+ out_java_struct += (", ")
+ elif takes_self:
+ continue
+ if arg.java_ty != "void":
+ if arg.arg_name in default_constructor_args:
+ for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]):
+ if explode_idx != 0:
+ out_java_struct += (", ")
+ out_java_struct += (
+ explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name)
+ else:
+ out_java_struct += (arg.java_hu_ty + " " + arg.arg_name)
out_c += (") {\n")
if out_java_struct is not None:
out_c += ("\n\treturn ret_val;")
out_c += ("\n}\n\n")
- if has_out_java_struct:
+ if args_known:
out_java_struct += ("\t\t")
if return_type_info.java_ty != "void":
out_java_struct += (return_type_info.java_ty + " ret = ")
elif info.from_hu_conv is not None and info.from_hu_conv[1] != "":
if not takes_self and return_type_info.to_hu_conv_name is not None:
out_java_struct += (
- "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name) + ";\n")
+ "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name).replace("\n", "\n\t\t") + ";\n")
else:
- out_java_struct += ("\t\t" + info.from_hu_conv[1] + ";\n")
+ out_java_struct += ("\t\t" + info.from_hu_conv[1].replace("\n", "\n\t\t") + ";\n")
if return_type_info.to_hu_conv_name is not None:
out_java_struct += ("\t\treturn " + return_type_info.to_hu_conv_name + ";\n")