add concept macros!

Author: devsh

include/nbl/builtin/hlsl/concepts.hlsl

@@ -10,14 +10,31 @@
 #include <nbl/builtin/hlsl/type_traits.hlsl>
 
 
-#ifndef __HLSL_VERSION
-
-// TODO: old stuff, see how much we can remove
-#define NBL_CONCEPT_TYPE_PARAMS(...) template <__VA_ARGS__>
-#define NBL_CONCEPT_SIGNATURE(NAME, ...) concept NAME = requires(__VA_ARGS__)
-#define NBL_CONCEPT_BODY(...) { __VA_ARGS__ };
-#define NBL_CONCEPT_ASSIGN(NAME, ...) concept NAME = __VA_ARGS__;
-#define NBL_REQUIRES(...) requires __VA_ARGS__ 
+namespace nbl
+{
+namespace hlsl
+{
+namespace concepts
+{
+// common implementation juice
+#include <boost/preprocessor/seq/elem.hpp>
+#define NBL_IMPL_CONCEPT_FULL_TPLT(z, n, unused) BOOST_PP_SEQ_ELEM(n,NBL_CONCEPT_TPLT_PRM_KINDS) BOOST_PP_SEQ_ELEM(n,NBL_CONCEPT_TPLT_PRM_NAMES)
+#include <boost/preprocessor/repetition/enum.hpp>
+#define NBL_CONCEPT_FULL_TPLT() BOOST_PP_ENUM(BOOST_PP_SEQ_SIZE(NBL_CONCEPT_TPLT_PRM_NAMES),NBL_IMPL_CONCEPT_FULL_TPLT,DUMMY)
+#include <boost/preprocessor/seq/enum.hpp>
+#define NBL_CONCEPT_TPLT_PARAMS() BOOST_PP_SEQ_ENUM(NBL_CONCEPT_TPLT_PRM_NAMES)
+#include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/control/expr_if.hpp>
+#include <boost/preprocessor/seq/for_each_i.hpp>
+//
+#define NBL_CONCEPT_REQ_TYPE 0
+#define NBL_CONCEPT_REQ_EXPR 1
+//
+#define NBL_CONCEPT_REQ_EXPR_RET_TYPE 2
+
+
+//! Now diverge
+#ifndef __cpp_concepts
 
 
 // to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
@@ -37,14 +54,30 @@
 // condition, use instead of the closing `>` of a function template
 #define NBL_FUNC_REQUIRES(...) > requires (__VA_ARGS__)
 
-#include <concepts>
 
-namespace nbl
-{
-namespace hlsl
-{
-namespace concepts
+//
+#define NBL_CONCEPT_PARAM_T(ID,...) ID
+//
+#define NBL_IMPL_IMPL_CONCEPT_BEGIN(A,...) __VA_ARGS__ A
+#define NBL_IMPL_CONCEPT_BEGIN(z,n,data) NBL_IMPL_IMPL_CONCEPT_BEGIN NBL_CONCEPT_PARAM_##n
+// TODO: are empty local parameter lists valid? a.k.a. just a `()`
+#define NBL_CONCEPT_BEGIN(LOCAL_PARAM_COUNT) template<NBL_CONCEPT_FULL_TPLT()> \
+concept NBL_CONCEPT_NAME = requires BOOST_PP_EXPR_IF(LOCAL_PARAM_COUNT,(BOOST_PP_ENUM(LOCAL_PARAM_COUNT,NBL_IMPL_CONCEPT_BEGIN,DUMMY))) \
 {
+//
+#define NBL_IMPL_CONCEPT_REQ_TYPE(...) typename __VA_ARGS__;
+#define NBL_IMPL_CONCEPT_REQ_EXPR(...) __VA_ARGS__;
+#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) {E}; C<decltype E,__VA_ARGS__ >;
+//
+#define NBL_IMPL_CONCEPT (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
+//
+#define NBL_IMPL_CONCEPT_END_DEF(r,unused,i,e) NBL_EVAL(BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT) BOOST_PP_SEQ_TAIL(e))
+//
+#define NBL_CONCEPT_END(SEQ) BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_CONCEPT_END_DEF, DUMMY, SEQ) \
+}
+
+
+#include <concepts>
 
 // Alias some of the std concepts in nbl. As this is C++20 only, we don't need to use
 // the macros here.
@@ -90,22 +123,11 @@ concept vectorial = is_vector<T>::value;
 template <typename T>
 concept matricial = is_matrix<T>::value;
 
-}
-}
-}
-
 #else
 
-// TODO: old stuff, see how much we can remove
-// No C++20 support. Do nothing.
-#define NBL_CONCEPT_TYPE_PARAMS(...)
-#define NBL_CONCEPT_SIGNATURE(NAME, ...) 
-#define NBL_CONCEPT_BODY(...)
-#define NBL_REQUIRES(...)
-
 
 // to define a concept using `concept Name = SomeContexprBoolCondition<T>;`
-#define NBL_BOOL_CONCEPT NBL_CONSTEXPR_STATIC_INLINE bool
+#define NBL_BOOL_CONCEPT NBL_CONSTEXPR bool
 
 // for struct definitions, use instead of closing `>` on the primary template parameter list
 #define NBL_PRIMARY_REQUIRES(...) ,typename __requires=::nbl::hlsl::enable_if_t<(__VA_ARGS__),void> > 
@@ -121,7 +143,39 @@ concept matricial = is_matrix<T>::value;
 // condition, use instead of the closing `>` of a function template
 #define NBL_FUNC_REQUIRES(...) ,std::enable_if_t<(__VA_ARGS__),bool> = true>
 
-#endif
 
+//
+#define NBL_CONCEPT_BEGIN(LOCAL_PARAM_COUNT) namespace BOOST_PP_CAT(__concept__,NBL_CONCEPT_NAME) \
+{
+//
+#define NBL_CONCEPT_PARAM_T(ID,...) ::nbl::hlsl::impl::declval<__VA_ARGS__ >()
+//
+#define NBL_IMPL_CONCEPT_REQ_TYPE(...) ::nbl::hlsl::make_void_t<typename __VA_ARGS__ >
+#define NBL_IMPL_CONCEPT_REQ_EXPR(...) ::nbl::hlsl::make_void_t<decltype(__VA_ARGS__)>
+#define NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE(E,C,...) C<decltype E ,__VA_ARGS__  >
+//
+#define NBL_IMPL_CONCEPT_SFINAE (typename=void,typename=void,bool=true)
+#define NBL_IMPL_CONCEPT_SFINAE_SPEC (NBL_IMPL_CONCEPT_REQ_TYPE,NBL_IMPL_CONCEPT_REQ_EXPR,NBL_IMPL_CONCEPT_REQ_EXPR_RET_TYPE)
+//
+#define NBL_IMPL_CONCEPT_END_DEF(r,unused,i,e) template<NBL_CONCEPT_FULL_TPLT(), BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT_SFINAE)> \
+struct BOOST_PP_CAT(__requirement,i) : ::nbl::hlsl::false_type {}; \
+template<NBL_CONCEPT_FULL_TPLT()> \
+struct BOOST_PP_CAT(__requirement,i)<NBL_CONCEPT_TPLT_PARAMS(), \
+NBL_EVAL(BOOST_PP_TUPLE_ELEM(BOOST_PP_SEQ_HEAD(e),NBL_IMPL_CONCEPT_SFINAE_SPEC) BOOST_PP_SEQ_TAIL(e)) \
+ > : ::nbl::hlsl::true_type {};
+//
+#define NBL_IMPL_CONCEPT_END_GET(r,unused,i,e) BOOST_PP_EXPR_IF(i,&&) BOOST_PP_CAT(__concept__,NBL_CONCEPT_NAME)::BOOST_PP_CAT(__requirement,i)<NBL_CONCEPT_TPLT_PARAMS()>::value
+//
+#define NBL_CONCEPT_END(SEQ) BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_CONCEPT_END_DEF, DUMMY, SEQ) \
+} \
+template<NBL_CONCEPT_FULL_TPLT()> \
+NBL_CONSTEXPR bool NBL_CONCEPT_NAME = BOOST_PP_SEQ_FOR_EACH_I(NBL_IMPL_CONCEPT_END_GET, DUMMY, SEQ)
+
+// TODO: counterparts of all the other concepts
+
+#endif
+}
+}
+}
 
 #endif

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -574,6 +574,9 @@ using enable_if = std::enable_if<B, T>;
 template<class T>
 using alignment_of = std::alignment_of<T>;
 
+template<typename T>
+using make_void_t = typename make_void<T>::type;
+
 template<class T> using remove_const = std::remove_const<T>;
 template<class T> using remove_volatile = std::remove_volatile<T>;
 template<class T> using remove_cv = std::remove_cv<T>;