Merge pull request #617 from Devsh-Graphics-Programming/member_test

Merge fixes from Member Test macro branch

Author: devshgraphicsprogramming

examples_tests

@@ -19,6 +19,7 @@ namespace impl
 template<class T, bool C>
 struct is_const_helper : bool_constant<C>
 {
+    using type = T;
     NBL_CONSTEXPR_STATIC_INLINE bool is_constant = is_const<T>::value;
 };
 
@@ -33,6 +34,11 @@ enum e_member_presence
 template<class T>
 T declval(){}
 
+template<bool=false>
+struct if_2_else_1 : integral_constant<uint32_t,1> {};
+template<>
+struct if_2_else_1<true> : integral_constant<uint32_t,2> {};
+
 }
 
 typedef impl::e_member_presence e_member_presence;
@@ -67,5 +73,94 @@ NBL_GENERATE_MEMBER_TESTER(y)
 NBL_GENERATE_MEMBER_TESTER(z)
 NBL_GENERATE_MEMBER_TESTER(w)
 
+
+// Even though it should work for some reason tests fail
+// proof it works : https://godbolt.org/z/EzPWGnTPb
+
+#define CAT(x, y) x##y
+#define TYPE_DECLARE(n) typename Arg##n
+#define TYPE_DECLARE_DEFAULT(n) TYPE_DECLARE(n)=void
+#define TYPE_FWD(n) Arg##n
+#define DECLVAL_DECLARE(n) impl::declval<Arg##n>()
+
+#define FOR_EACH0(fn)  
+#define FOR_EACH1(fn) fn(1)
+#define FOR_EACH2(fn) fn(2), FOR_EACH1(fn)
+#define FOR_EACH3(fn) fn(3), FOR_EACH2(fn)
+#define FOR_EACH4(fn) fn(4), FOR_EACH3(fn)
+#define FOR_EACH(fn, n) CAT(FOR_EACH, n)(fn)
+
+#define GENERATE_STATIC_METHOD_TESTER_SPEC0(x) \
+template<class T> \
+struct has_static_method_##x<T, typename make_void<decltype(T::x())>::type> : true_type \
+{ \
+    using return_type = decltype(T::x()); \
+    NBL_CONSTEXPR_STATIC_INLINE uint arg_count = 0; \
+}; 
+
+#define GENERATE_STATIC_METHOD_TESTER_SPEC(x, n) \
+template<class T, FOR_EACH(TYPE_DECLARE, n)> \
+struct has_static_method_##x<T, FOR_EACH(TYPE_FWD, n), typename make_void<decltype(T::x(FOR_EACH(DECLVAL_DECLARE, n)))>::type> : true_type \
+{ \
+    using return_type = decltype(T::x(FOR_EACH(DECLVAL_DECLARE, n))); \
+    NBL_CONSTEXPR_STATIC_INLINE uint arg_count = n; \
+}; 
+
+#define GENERATE_STATIC_METHOD_TESTER(x) \
+template<typename T, FOR_EACH(TYPE_DECLARE_DEFAULT, 4), class=void> \
+struct has_static_method_##x : false_type {}; \
+GENERATE_STATIC_METHOD_TESTER_SPEC0(x)  \
+GENERATE_STATIC_METHOD_TESTER_SPEC(x, 1)  \
+GENERATE_STATIC_METHOD_TESTER_SPEC(x, 2)  \
+GENERATE_STATIC_METHOD_TESTER_SPEC(x, 3)  \
+GENERATE_STATIC_METHOD_TESTER_SPEC(x, 4) 
+
+#define GENERATE_METHOD_TESTER_SPEC0(x) \
+template<class T> \
+struct has_method_##x<T, typename make_void<decltype(impl::declval<T>().x())>::type> : impl::if_2_else_1<impl::has_static_method_##x<T>::value> \
+{ \
+    using return_type = decltype(impl::declval<T>().x()); \
+    NBL_CONSTEXPR_STATIC_INLINE uint arg_count = 0; \
+}; 
+
+#define GENERATE_METHOD_TESTER_SPEC(x, n) \
+template<class T, FOR_EACH(TYPE_DECLARE, n)> \
+struct has_method_##x<T, FOR_EACH(TYPE_FWD, n), typename make_void<decltype(impl::declval<T>().x(FOR_EACH(DECLVAL_DECLARE, n)))>::type> : impl::if_2_else_1<impl::has_static_method_##x<T,FOR_EACH(TYPE_FWD, n)>::value> \
+{ \
+    using return_type = decltype(impl::declval<T>().x(FOR_EACH(DECLVAL_DECLARE, n))); \
+    NBL_CONSTEXPR_STATIC_INLINE uint arg_count = n; \
+}; 
+
+/* 
+    types that are impilicitly convertible to each other mess this check up 
+
+    struct S
+    {
+        void a(int) { return 0;}
+    };
+
+    has_method_a<S, float>::value will be true 
+    since float is implicitly convertible to int and
+    due to how we check function signatures at the moment
+*/
+
+#define GENERATE_METHOD_TESTER(x) \
+namespace nbl { \
+namespace hlsl { \
+namespace impl { GENERATE_STATIC_METHOD_TESTER(x) } \
+template<typename T, FOR_EACH(TYPE_DECLARE_DEFAULT, 4), class=void> \
+struct has_method_##x : false_type {}; \
+GENERATE_METHOD_TESTER_SPEC0(x) \
+GENERATE_METHOD_TESTER_SPEC(x, 1) \
+GENERATE_METHOD_TESTER_SPEC(x, 2) \
+GENERATE_METHOD_TESTER_SPEC(x, 3) \
+GENERATE_METHOD_TESTER_SPEC(x, 4) \
+}}
+
+
+GENERATE_METHOD_TESTER(a)
+GENERATE_METHOD_TESTER(b)
+
+
 #endif
 #endif

include/nbl/builtin/hlsl/member_test_macros.hlsl

@@ -212,7 +212,7 @@ template<bool val>
 struct bool_constant : integral_constant<bool, val> {};
 
 struct true_type : bool_constant<true> {};
-struct false_type : bool_constant<true> {};
+struct false_type : bool_constant<false> {};
 
 template<bool C, class T, class F>
 struct conditional : type_identity<T> {};