asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #76047 from Daylily-Zeleen/daylily-zeleen/builtin_vararg_ptrcall

Browse source 
Set vararg methods' ptrcall of builtin classes, and let them can be called without arguments.
This commit is contained in:
Rémi Verschelde 2023-09-02 14:27:41 +02:00
commit ec517dcbaf
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/variant/variant_call.cpp
View file

@ -561,8 +561,8 @@ static _FORCE_INLINE_ void vc_ptrcall(void (*method)(T *, P...), void *p_base, c
} \ } \
static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \ static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
LocalVector<Variant> vars; \ LocalVector<Variant> vars; \
vars.resize(p_argcount); \
LocalVector<const Variant *> vars_ptrs; \ LocalVector<const Variant *> vars_ptrs; \
vars.resize(p_argcount); \
vars_ptrs.resize(p_argcount); \ vars_ptrs.resize(p_argcount); \
for (int i = 0; i < p_argcount; i++) { \ for (int i = 0; i < p_argcount; i++) { \
vars[i] = PtrToArg<Variant>::convert(p_args[i]); \ vars[i] = PtrToArg<Variant>::convert(p_args[i]); \
@ -571,7 +571,7 @@ static _FORCE_INLINE_ void vc_ptrcall(void (*method)(T *, P...), void *p_base, c
Variant base = PtrToArg<m_class>::convert(p_base); \ Variant base = PtrToArg<m_class>::convert(p_base); \
Variant ret; \ Variant ret; \
Callable::CallError ce; \ Callable::CallError ce; \
m_method_ptr(&base, (const Variant **)&vars_ptrs[0], p_argcount, ret, ce); \ m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce); \
if (m_has_return) { \ if (m_has_return) { \
m_return_type r = ret; \ m_return_type r = ret; \
PtrToArg<m_return_type>::encode(ret, r_ret); \ PtrToArg<m_return_type>::encode(ret, r_ret); \
@ -617,8 +617,8 @@ static _FORCE_INLINE_ void vc_ptrcall(void (*method)(T *, P...), void *p_base, c
} \ } \
static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \ static void ptrcall(void *p_base, const void **p_args, void *r_ret, int p_argcount) { \
LocalVector<Variant> vars; \ LocalVector<Variant> vars; \
vars.resize(p_argcount); \
LocalVector<const Variant *> vars_ptrs; \ LocalVector<const Variant *> vars_ptrs; \
vars.resize(p_argcount); \
vars_ptrs.resize(p_argcount); \ vars_ptrs.resize(p_argcount); \
for (int i = 0; i < p_argcount; i++) { \ for (int i = 0; i < p_argcount; i++) { \
vars[i] = PtrToArg<Variant>::convert(p_args[i]); \ vars[i] = PtrToArg<Variant>::convert(p_args[i]); \
@ -627,7 +627,7 @@ static _FORCE_INLINE_ void vc_ptrcall(void (*method)(T *, P...), void *p_base, c
Variant base = PtrToArg<m_class>::convert(p_base); \ Variant base = PtrToArg<m_class>::convert(p_base); \
Variant ret; \ Variant ret; \
Callable::CallError ce; \ Callable::CallError ce; \
m_method_ptr(&base, (const Variant **)&vars_ptrs[0], p_argcount, ret, ce); \ m_method_ptr(&base, vars_ptrs.ptr(), p_argcount, ret, ce); \
} \ } \
static int get_argument_count() { \ static int get_argument_count() { \
return 1; \ return 1; \
@ -1132,11 +1132,7 @@ static void register_builtin_method(const Vector<String> &p_argnames, const Vect
imi.call = T::call; imi.call = T::call;
imi.validated_call = T::validated_call; imi.validated_call = T::validated_call;
if (T::is_vararg()) { imi.ptrcall = T::ptrcall;
imi.ptrcall = nullptr;
} else {
imi.ptrcall = T::ptrcall;
}
imi.default_arguments = p_def_args; imi.default_arguments = p_def_args;
imi.argument_names = p_argnames; imi.argument_names = p_argnames;