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

Merge pull request #1423 from AThousandShips/style_fix 

Fix some style details in generation
pull/1497/head
David Snopek 2024-06-18 11:24:11 -05:00 committed by GitHub
parent ed1e963a31 e7a13e3bf4
commit 0efc6cddbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
binding_generator.py
View File

@ -797,14 +797,16 @@ def generate_builtin_class_header(builtin_api, size, used_classes, fully_used_cl
vararg = method["is_vararg"] vararg = method["is_vararg"]
if vararg: if vararg:
result.append("\ttemplate<typename... Args>") result.append("\ttemplate <typename... Args>")
method_signature = "\t" method_signature = "\t"
if "is_static" in method and method["is_static"]: if "is_static" in method and method["is_static"]:
method_signature += "static " method_signature += "static "
if "return_type" in method: if "return_type" in method:
method_signature += f'{correct_type(method["return_type"])} ' method_signature += f'{correct_type(method["return_type"])}'
if not method_signature.endswith("*"):
method_signature += " "
else: else:
method_signature += "void " method_signature += "void "
@ -1222,7 +1224,7 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
continue continue
method_signature = make_signature(class_name, method, for_builtin=True) method_signature = make_signature(class_name, method, for_builtin=True)
result.append(method_signature + "{") result.append(method_signature + " {")
method_call = "\t" method_call = "\t"
is_ref = False is_ref = False
@ -1642,8 +1644,6 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
vararg = "is_vararg" in method and method["is_vararg"] vararg = "is_vararg" in method and method["is_vararg"]
method_signature = "\t" method_signature = "\t"
if vararg:
method_signature += "private: "
method_signature += make_signature( method_signature += make_signature(
class_name, method, for_header=True, use_template_get_node=use_template_get_node class_name, method, for_header=True, use_template_get_node=use_template_get_node
) )
@ -1722,16 +1722,16 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
if class_name == "Object": if class_name == "Object":
result.append("") result.append("")
result.append("\ttemplate<typename T>") result.append("\ttemplate <typename T>")
result.append("\tstatic T *cast_to(Object *p_object);") result.append("\tstatic T *cast_to(Object *p_object);")
result.append("\ttemplate<typename T>") result.append("\ttemplate <typename T>")
result.append("\tstatic const T *cast_to(const Object *p_object);") result.append("\tstatic const T *cast_to(const Object *p_object);")
result.append("\tvirtual ~Object() = default;") result.append("\tvirtual ~Object() = default;")
elif use_template_get_node and class_name == "Node": elif use_template_get_node and class_name == "Node":
result.append("\ttemplate<typename T>") result.append("\ttemplate <typename T>")
result.append( result.append(
"\tT *get_node(const NodePath &p_path) const { return Object::cast_to<T>(get_node_internal(p_path)); }" "\tT *get_node(const NodePath &p_path) const { return Object::cast_to<T>(get_node_internal(p_path)); }"
) )
@ -1773,7 +1773,7 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
vararg = "is_vararg" in method and method["is_vararg"] vararg = "is_vararg" in method and method["is_vararg"]
if vararg: if vararg:
method_signature = "\ttemplate<typename... Args> static " method_signature = "\ttemplate <typename... Args> static "
else: else:
method_signature = "\tstatic " method_signature = "\tstatic "
@ -1787,7 +1787,9 @@ def generate_engine_class_header(class_api, used_classes, fully_used_classes, us
False, False,
) )
if return_type is not None: if return_type is not None:
method_signature += return_type + " " method_signature += return_type
if not method_signature.endswith("*"):
method_signature += " "
else: else:
method_signature += "void " method_signature += "void "
@ -2415,7 +2417,7 @@ def make_varargs_template(
if with_public_declare: if with_public_declare:
function_signature = "public: " function_signature = "public: "
function_signature += "template<typename... Args> " function_signature += "template <typename... Args> "
if static: if static:
function_signature += "static " function_signature += "static "
@ -2469,7 +2471,7 @@ def make_varargs_template(
args_array += "Variant(p_args)... };" args_array += "Variant(p_args)... };"
result.append(args_array) result.append(args_array)
result.append(f"\tstd::array<const Variant *, {len(method_arguments)} + sizeof...(Args)> call_args;") result.append(f"\tstd::array<const Variant *, {len(method_arguments)} + sizeof...(Args)> call_args;")
result.append("\tfor(size_t i = 0; i < variant_args.size(); i++) {") result.append("\tfor (size_t i = 0; i < variant_args.size(); i++) {")
result.append("\t\tcall_args[i] = &variant_args[i];") result.append("\t\tcall_args[i] = &variant_args[i];")
result.append("\t}") result.append("\t}")
@ -2735,7 +2737,7 @@ def correct_type(type_name, meta=None, use_alias=True):
return f"Ref<{type_name}>" return f"Ref<{type_name}>"
if type_name == "Object" or is_engine_class(type_name): if type_name == "Object" or is_engine_class(type_name):
return f"{type_name} *" return f"{type_name} *"
if type_name.endswith("*"): if type_name.endswith("*") and not type_name.endswith("**") and not type_name.endswith(" *"):
return f"{type_name[:-1]} *" return f"{type_name[:-1]} *"
return type_name return type_name