Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111327 from Ivorforce/gdvirtual-shorten-get-method-info

Browse source 
Simplify `gdvirtual.gen.inc` `_get_method_info` arguments with a helper function.
This commit is contained in:
Thaddeus Crews 2025-10-07 17:15:12 -05:00
commit d61cd9149a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/object/make_virtuals.py
View file

@ -127,6 +127,15 @@ def generate_version(argcount, const=False, returns=False, required=False, compa
callsiargs = f"Variant vargs[{argcount}] = {{ " callsiargs = f"Variant vargs[{argcount}] = {{ "
callsiargptrs = f"\t\t\tconst Variant *vargptrs[{argcount}] = {{ " callsiargptrs = f"\t\t\tconst Variant *vargptrs[{argcount}] = {{ "
callptrargsptr = f"\t\t\tGDExtensionConstTypePtr argptrs[{argcount}] = {{ " callptrargsptr = f"\t\t\tGDExtensionConstTypePtr argptrs[{argcount}] = {{ "
if method_info:
method_info += "\\\n\t\t"
method_info += (
"_gdvirtual_set_method_info_args<"
+ ", ".join(f"m_type{i + 1}" for i in range(argcount))
+ ">(method_info);"
)
callptrargs = "" callptrargs = ""
for i in range(argcount): for i in range(argcount):
if i > 0: if i > 0:
@ -144,10 +153,6 @@ def generate_version(argcount, const=False, returns=False, required=False, compa
f"PtrToArg<m_type{i + 1}>::EncodeT argval{i + 1} = (PtrToArg<m_type{i + 1}>::EncodeT)arg{i + 1};\\\n" f"PtrToArg<m_type{i + 1}>::EncodeT argval{i + 1} = (PtrToArg<m_type{i + 1}>::EncodeT)arg{i + 1};\\\n"
) )
callptrargsptr += f"&argval{i + 1}" callptrargsptr += f"&argval{i + 1}"
if method_info:
method_info += "\\\n\t\t"
method_info += f"method_info.arguments.push_back(GetTypeInfo<m_type{i + 1}>::get_class_info());\\\n"
method_info += f"\t\tmethod_info.arguments_metadata.push_back(GetTypeInfo<m_type{i + 1}>::METADATA);"
if argcount: if argcount:
callsiargs += " };\\\n" callsiargs += " };\\\n"
@ -197,6 +202,12 @@ def run(target, source, env):
inline constexpr uintptr_t _INVALID_GDVIRTUAL_FUNC_ADDR = static_cast<uintptr_t>(-1); inline constexpr uintptr_t _INVALID_GDVIRTUAL_FUNC_ADDR = static_cast<uintptr_t>(-1);
template <typename... Args>
void _gdvirtual_set_method_info_args(MethodInfo &p_method_info) {
p_method_info.arguments = { GetTypeInfo<Args>::get_class_info()... };
p_method_info.arguments_metadata = { GetTypeInfo<Args>::METADATA... };
}
""" """
for i in range(max_versions + 1): for i in range(max_versions + 1):