Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct element type for `TypedArray<>`

pull/1547/head
Raul Santos 2024-08-13 14:56:58 +02:00
parent 11773e52b0
commit 9fd0a12654
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
binding_generator.py
View File

@ -1918,11 +1918,17 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
) )
method_call = "\t" method_call = "\t"
has_return = "return_value" in method and method["return_value"]["type"] != "void" has_return = "return_value" in method and method["return_value"]["type"] != "void"
has_meta = "return_value" in method and "meta" in method["return_value"]
if has_return: if has_return:
result.append( if has_meta:
f'\tCHECK_METHOD_BIND_RET(_gde_method_bind, {get_default_value_for_type(method["return_value"]["type"])});' result.append(
) f'\tCHECK_METHOD_BIND_RET(_gde_method_bind, {get_default_value_for_type(method["return_value"]["type"], method["return_value"]["meta"])});'
)
else:
result.append(
f'\tCHECK_METHOD_BIND_RET(_gde_method_bind, {get_default_value_for_type(method["return_value"]["type"])});'
)
else: else:
result.append("\tCHECK_METHOD_BIND(_gde_method_bind);") result.append("\tCHECK_METHOD_BIND(_gde_method_bind);")
@ -2708,15 +2714,9 @@ def correct_default_value(value, type_name):
return value return value
def correct_typed_array(type_name):
if type_name.startswith("typedarray::"):
return type_name.replace("typedarray::", "TypedArray<") + ">"
return type_name
def correct_type(type_name, meta=None, use_alias=True): def correct_type(type_name, meta=None, use_alias=True):
type_conversion = {"float": "double", "int": "int64_t", "Nil": "Variant"} type_conversion = {"float": "double", "int": "int64_t", "Nil": "Variant"}
if meta is not None: if meta is not None and not type_name.startswith("typedarray::"):
if "int" in meta: if "int" in meta:
return f"{meta}_t" return f"{meta}_t"
elif meta in type_conversion: elif meta in type_conversion:
@ -2726,7 +2726,10 @@ def correct_type(type_name, meta=None, use_alias=True):
if type_name in type_conversion: if type_name in type_conversion:
return type_conversion[type_name] return type_conversion[type_name]
if type_name.startswith("typedarray::"): if type_name.startswith("typedarray::"):
return type_name.replace("typedarray::", "TypedArray<") + ">" elem_type = type_name[len("typedarray::") :]
if meta is not None:
elem_type = correct_type(elem_type, meta)
return "TypedArray<" + elem_type + ">"
if is_enum(type_name): if is_enum(type_name):
if is_bitfield(type_name): if is_bitfield(type_name):
base_class = get_enum_class(type_name) base_class = get_enum_class(type_name)
@ -2832,7 +2835,7 @@ def get_operator_id_name(op):
return op_id_map[op] return op_id_map[op]
def get_default_value_for_type(type_name): def get_default_value_for_type(type_name, meta=None):
if type_name == "int": if type_name == "int":
return "0" return "0"
if type_name == "float": if type_name == "float":
@ -2840,7 +2843,7 @@ def get_default_value_for_type(type_name):
if type_name == "bool": if type_name == "bool":
return "false" return "false"
if type_name.startswith("typedarray::"): if type_name.startswith("typedarray::"):
return f"{correct_type(type_name)}()" return f"{correct_type(type_name, meta)}()"
if is_enum(type_name): if is_enum(type_name):
return f"{correct_type(type_name)}(0)" return f"{correct_type(type_name)}(0)"
if is_variant(type_name): if is_variant(type_name):