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

Merge pull request #43728 from vnen/variant-getter-set-type

Browse source 
Fix variant getters not setting return type
This commit is contained in:
Rémi Verschelde 2020-11-22 09:50:38 +01:00 committed by GitHub
commit 52e2650b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/variant/variant_call.cpp
View file

@ -42,27 +42,6 @@
typedef void (*VariantFunc)(Variant &r_ret, Variant &p_self, const Variant **p_args); typedef void (*VariantFunc)(Variant &r_ret, Variant &p_self, const Variant **p_args);
typedef void (*VariantConstructFunc)(Variant &r_ret, const Variant **p_args); typedef void (*VariantConstructFunc)(Variant &r_ret, const Variant **p_args);
template <class T>
struct TypeAdjust {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
VariantTypeChanger<typename GetSimpleTypeT<T>::type_t>::change(r_ret);
}
};
template <> //do nothing for variant
struct TypeAdjust<Variant> {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
}
};
template <> //do nothing for variant
struct TypeAdjust<Object *> {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
VariantInternal::clear(r_ret);
*r_ret = (Object *)nullptr;
}
};
template <class R, class T, class... P> template <class R, class T, class... P>
static _FORCE_INLINE_ void vc_method_call(R (T::*method)(P...), Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) { static _FORCE_INLINE_ void vc_method_call(R (T::*method)(P...), Variant *base, const Variant **p_args, int p_argcount, Variant &r_ret, const Vector<Variant> &p_defvals, Callable::CallError &r_error) {
call_with_variant_args_ret_dv(VariantGetInternalPtr<T>::get_ptr(base), method, p_args, p_argcount, r_ret, r_error, p_defvals); call_with_variant_args_ret_dv(VariantGetInternalPtr<T>::get_ptr(base), method, p_args, p_argcount, r_ret, r_error, p_defvals);
@ -124,12 +103,12 @@ static _FORCE_INLINE_ void vc_ptrcall(void (T::*method)(P...) const, void *p_bas
template <class R, class T, class... P> template <class R, class T, class... P>
static _FORCE_INLINE_ void vc_change_return_type(R (T::*method)(P...), Variant *v) { static _FORCE_INLINE_ void vc_change_return_type(R (T::*method)(P...), Variant *v) {
TypeAdjust<R>::adjust(v); VariantTypeAdjust<R>::adjust(v);
} }
template <class R, class T, class... P> template <class R, class T, class... P>
static _FORCE_INLINE_ void vc_change_return_type(R (T::*method)(P...) const, Variant *v) { static _FORCE_INLINE_ void vc_change_return_type(R (T::*method)(P...) const, Variant *v) {
TypeAdjust<R>::adjust(v); VariantTypeAdjust<R>::adjust(v);
} }
template <class T, class... P> template <class T, class... P>
@ -144,7 +123,7 @@ static _FORCE_INLINE_ void vc_change_return_type(void (T::*method)(P...) const,
template <class R, class... P> template <class R, class... P>
static _FORCE_INLINE_ void vc_change_return_type(R (*method)(P...), Variant *v) { static _FORCE_INLINE_ void vc_change_return_type(R (*method)(P...), Variant *v) {
TypeAdjust<R>::adjust(v); VariantTypeAdjust<R>::adjust(v);
} }
template <class R, class T, class... P> template <class R, class T, class... P>

22
core/variant/variant_internal.h
View file

@ -1128,4 +1128,26 @@ struct VariantTypeChanger {
} }
}; };
template <class T>
struct VariantTypeAdjust {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
VariantTypeChanger<typename GetSimpleTypeT<T>::type_t>::change(r_ret);
}
};
template <>
struct VariantTypeAdjust<Variant> {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
// Do nothing for variant.
}
};
template <>
struct VariantTypeAdjust<Object *> {
_FORCE_INLINE_ static void adjust(Variant *r_ret) {
VariantInternal::clear(r_ret);
*r_ret = (Object *)nullptr;
}
};
#endif // VARIANT_INTERNAL_H #endif // VARIANT_INTERNAL_H

106
core/variant/variant_setget.cpp
View file

@ -41,9 +41,7 @@
#define SETGET_STRUCT(m_base_type, m_member_type, m_member) \ #define SETGET_STRUCT(m_base_type, m_member_type, m_member) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -71,9 +69,7 @@
#define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member) \ #define SETGET_NUMBER_STRUCT(m_base_type, m_member_type, m_member) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_member; \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -104,9 +100,7 @@
#define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \ #define SETGET_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -134,9 +128,7 @@
#define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \ #define SETGET_NUMBER_STRUCT_CUSTOM(m_base_type, m_member_type, m_member, m_custom) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_custom; \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -167,9 +159,7 @@
#define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \ #define SETGET_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -197,9 +187,7 @@
#define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \ #define SETGET_NUMBER_STRUCT_FUNC(m_base_type, m_member_type, m_member, m_setter, m_getter) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(); \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -230,9 +218,7 @@
#define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index) \ #define SETGET_STRUCT_FUNC_INDEX(m_base_type, m_member_type, m_member, m_setter, m_getter, m_index) \
struct VariantSetGet_##m_base_type##_##m_member { \ struct VariantSetGet_##m_base_type##_##m_member { \
static void get(const Variant *base, Variant *member) { \ static void get(const Variant *base, Variant *member) { \
*member = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \ VariantTypeAdjust<m_member_type>::adjust(member); \
} \
static void validated_get(const Variant *base, Variant *member) { \
*VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \ *VariantGetInternalPtr<m_member_type>::get_ptr(member) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_getter(m_index); \
} \ } \
static void ptr_get(const void *base, void *member) { \ static void ptr_get(const void *base, void *member) { \
@ -340,7 +326,7 @@ static void register_member(Variant::Type p_type, const StringName &p_member) {
sgi.ptr_setter = T::ptr_set; sgi.ptr_setter = T::ptr_set;
sgi.getter = T::get; sgi.getter = T::get;
sgi.validated_getter = T::validated_get; sgi.validated_getter = T::get;
sgi.ptr_getter = T::ptr_get; sgi.ptr_getter = T::ptr_get;
sgi.member_type = T::get_type(); sgi.member_type = T::get_type();
@ -605,18 +591,7 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
oob = true; \ oob = true; \
return; \ return; \
} \ } \
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ VariantTypeAdjust<m_elem_type>::adjust(value); \
oob = false; \
} \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
int64_t size = VariantGetInternalPtr<m_base_type>::get_ptr(base)->size(); \
if (index < 0) { \
index += size; \
} \
if (index < 0 || index >= size) { \
oob = true; \
return; \
} \
*VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ *VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \
oob = false; \ oob = false; \
} \ } \
@ -682,18 +657,7 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
oob = true; \ oob = true; \
return; \ return; \
} \ } \
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ VariantTypeAdjust<m_elem_type>::adjust(value); \
oob = false; \
} \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
int64_t size = VariantGetInternalPtr<m_base_type>::get_ptr(base)->size(); \
if (index < 0) { \
index += size; \
} \
if (index < 0 || index >= size) { \
oob = true; \
return; \
} \
*VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ *VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \
oob = false; \ oob = false; \
} \ } \
@ -760,14 +724,7 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
oob = true; \ oob = true; \
return; \ return; \
} \ } \
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ VariantTypeAdjust<m_elem_type>::adjust(value); \
oob = false; \
} \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
if (index < 0 || index >= m_max) { \
oob = true; \
return; \
} \
*VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ *VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \
oob = false; \ oob = false; \
} \ } \
@ -822,14 +779,7 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
oob = true; \ oob = true; \
return; \ return; \
} \ } \
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))m_accessor[index]; \ VariantTypeAdjust<m_elem_type>::adjust(value); \
oob = false; \
} \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
if (index < 0 || index >= m_max) { \
oob = true; \
return; \
} \
*VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))m_accessor[index]; \ *VariantGetInternalPtr<m_elem_type>::get_ptr(value) = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))m_accessor[index]; \
oob = false; \ oob = false; \
} \ } \
@ -878,14 +828,7 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
oob = true; \ oob = true; \
return; \ return; \
} \ } \
*value = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_get(index); \ VariantTypeAdjust<m_elem_type>::adjust(value); \
oob = false; \
} \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
if (index < 0 || index >= m_max) { \
oob = true; \
return; \
} \
*VariantGetInternalPtr<m_elem_type>::get_ptr(value) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_get(index); \ *VariantGetInternalPtr<m_elem_type>::get_ptr(value) = VariantGetInternalPtr<m_base_type>::get_ptr(base)->m_get(index); \
oob = false; \ oob = false; \
} \ } \
@ -941,18 +884,6 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \ *value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \
oob = false; \ oob = false; \
} \ } \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
int64_t size = VariantGetInternalPtr<m_base_type>::get_ptr(base)->size(); \
if (index < 0) { \
index += size; \
} \
if (index < 0 || index >= size) { \
oob = true; \
return; \
} \
*value = (*VariantGetInternalPtr<m_base_type>::get_ptr(base))[index]; \
oob = false; \
} \
static void ptr_get(const void *base, int64_t index, void *member) { \ static void ptr_get(const void *base, int64_t index, void *member) { \
/* avoid ptrconvert for performance*/ \ /* avoid ptrconvert for performance*/ \
const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \ const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
@ -1010,15 +941,6 @@ Variant Variant::get_named(const StringName &p_member, bool &r_valid) const {
*value = *ptr; \ *value = *ptr; \
oob = false; \ oob = false; \
} \ } \
static void validated_get(const Variant *base, int64_t index, Variant *value, bool &oob) { \
const Variant *ptr = VariantGetInternalPtr<m_base_type>::get_ptr(base)->getptr(index); \
if (!ptr) { \
oob = true; \
return; \
} \
*value = *ptr; \
oob = false; \
} \
static void ptr_get(const void *base, int64_t index, void *member) { \ static void ptr_get(const void *base, int64_t index, void *member) { \
/* avoid ptrconvert for performance*/ \ /* avoid ptrconvert for performance*/ \
const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \ const m_base_type &v = *reinterpret_cast<const m_base_type *>(base); \
@ -1094,7 +1016,7 @@ static void register_indexed_member(Variant::Type p_type) {
sgi.ptr_setter = T::ptr_set; sgi.ptr_setter = T::ptr_set;
sgi.getter = T::get; sgi.getter = T::get;
sgi.validated_getter = T::validated_get; sgi.validated_getter = T::get;
sgi.ptr_getter = T::ptr_get; sgi.ptr_getter = T::ptr_get;
sgi.index_type = T::get_index_type(); sgi.index_type = T::get_index_type();