port macros to boost pp

Author: atkurtul

include/nbl/builtin/hlsl/member_test_macros.hlsl

@@ -5,6 +5,7 @@
 #define _NBL_BUILTIN_HLSL_MEMBER_TEST_MACROS_INCLUDED_
 
 #include <nbl/builtin/hlsl/type_traits.hlsl>
+#include <boost/preprocessor.hpp>
 
 #ifdef __HLSL_VERSION
 
@@ -74,60 +75,31 @@ 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 NBL_REPEAT(fn, n) BOOST_PP_REPEAT(n, fn, n)
 
-#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 NBL_TYPE_DECLARE(z, n, x) BOOST_PP_COMMA_IF(x) typename Arg##n
+#define NBL_TYPE_DECLARE_DEFAULT(z, n, x) BOOST_PP_COMMA_IF(x) typename Arg##n=void
+#define NBL_TYPE_FWD(z, n, x) BOOST_PP_COMMA_IF(x) Arg##n
+#define NBL_DECLVAL_DECLARE(z, n, x) impl::declval<Arg##n>() BOOST_PP_COMMA_IF(BOOST_PP_NOT_EQUAL(BOOST_PP_INC(n), x))
 
-#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 \
+#define GENERATE_STATIC_METHOD_TESTER_SPEC(z, n, x) \
+template<class T NBL_REPEAT(NBL_TYPE_DECLARE, n)> \
+struct has_static_method_##x<T NBL_REPEAT(NBL_TYPE_FWD, n), typename make_void<decltype(T::x(NBL_REPEAT(NBL_DECLVAL_DECLARE, n)))>::type> : true_type \
 { \
-    using return_type = decltype(T::x(FOR_EACH(DECLVAL_DECLARE, n))); \
+    using return_type = decltype(T::x(NBL_REPEAT(NBL_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> \
+#define GENERATE_STATIC_METHOD_TESTER(x, n) \
+template<typename T NBL_REPEAT(NBL_TYPE_DECLARE_DEFAULT, n), 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; \
-}; 
+BOOST_PP_REPEAT(n, GENERATE_STATIC_METHOD_TESTER_SPEC, x)
 
-#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> \
+#define GENERATE_METHOD_TESTER_SPEC(z, n, x) \
+template<class T NBL_REPEAT(NBL_TYPE_DECLARE, n)> \
+struct has_method_##x<T NBL_REPEAT(NBL_TYPE_FWD, n), typename make_void<decltype(impl::declval<T>().x(NBL_REPEAT(NBL_DECLVAL_DECLARE, n)))>::type> : impl::if_2_else_1<impl::has_static_method_##x<T NBL_REPEAT(NBL_TYPE_FWD, n)>::value> \
 { \
-    using return_type = decltype(impl::declval<T>().x(FOR_EACH(DECLVAL_DECLARE, n))); \
+    using return_type = decltype(impl::declval<T>().x(NBL_REPEAT(NBL_DECLVAL_DECLARE, n))); \
     NBL_CONSTEXPR_STATIC_INLINE uint arg_count = n; \
 }; 
 
@@ -147,14 +119,10 @@ struct has_method_##x<T, FOR_EACH(TYPE_FWD, n), typename make_void<decltype(impl
 #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> \
+namespace impl { GENERATE_STATIC_METHOD_TESTER(x, 4) } \
+template<typename T NBL_REPEAT(NBL_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) \
+BOOST_PP_REPEAT(4, GENERATE_METHOD_TESTER_SPEC, x) \
 }}