Type/Traits

Author: MorganCaron

modules/Type/Callable.mpp

@@ -7,43 +7,79 @@ export namespace CppUtils::Type
 	template<class T>
 	struct CallableTrait;
 
-	template<class Functor>
-	requires requires { &Functor::operator(); }
-	struct CallableTrait<Functor>: CallableTrait<decltype(&Functor::operator())>
-	{};
-
 	template<class Return, class... Args>
-	struct CallableTrait<Return(Args...)>
+	struct SignatureTrait
 	{
 		using ReturnType = Return;
 		using ArgumentsTypes = std::tuple<Args...>;
 	};
 
+	template<class Return, class... Args>
+	struct CallableTrait<Return(Args...)>: SignatureTrait<Return, Args...>
+	{};
+
+	template<class Return, class... Args>
+	struct CallableTrait<Return(Args...) noexcept>: SignatureTrait<Return, Args...>
+	{};
+
 	template<class Return, class... Args>
 	struct CallableTrait<Return (*)(Args...)>: CallableTrait<Return(Args...)>
 	{};
 
+	template<class Return, class... Args>
+	struct CallableTrait<Return (*)(Args...) noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
 	template<class Object, class Return, class... Args>
 	struct CallableTrait<Return (Object::*)(Args...)>: CallableTrait<Return(Args...)>
 	{};
 
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) const>: CallableTrait<Return(Args...)>
+	{};
+
 	template<class Object, class Return, class... Args>
 	struct CallableTrait<Return (Object::*)(Args...) &>: CallableTrait<Return(Args...)>
 	{};
 
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) const&>: CallableTrait<Return(Args...)>
+	{};
+
 	template<class Object, class Return, class... Args>
 	struct CallableTrait<Return (Object::*)(Args...) &&>: CallableTrait<Return(Args...)>
 	{};
 
 	template<class Object, class Return, class... Args>
-	struct CallableTrait<Return (Object::*)(Args...) const>: CallableTrait<Return(Args...)>
+	struct CallableTrait<Return (Object::*)(Args...) const&&>: CallableTrait<Return(Args...)>
 	{};
 
 	template<class Object, class Return, class... Args>
-	struct CallableTrait<Return (Object::*)(Args...) const&>: CallableTrait<Return(Args...)>
+	struct CallableTrait<Return (Object::*)(Args...) noexcept>: CallableTrait<Return(Args...) noexcept>
 	{};
 
 	template<class Object, class Return, class... Args>
-	struct CallableTrait<Return (Object::*)(Args...) const&&>: CallableTrait<Return(Args...)>
+	struct CallableTrait<Return (Object::*)(Args...) const noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) & noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) const & noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) && noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
+	template<class Object, class Return, class... Args>
+	struct CallableTrait<Return (Object::*)(Args...) const && noexcept>: CallableTrait<Return(Args...) noexcept>
+	{};
+
+	template<class Functor>
+	requires requires { &Functor::operator(); }
+	struct CallableTrait<Functor>: CallableTrait<decltype(&Functor::operator())>
 	{};
 }

modules/Type/Concept.mpp

@@ -59,7 +59,13 @@ export namespace CppUtils::Type
 	concept TriviallyCopyable = std::is_trivially_copyable_v<T>;
 
 	template<class T>
-	concept Trivial = TriviallyConstructible<T> and TriviallyDestructible<T> and TriviallyCopyable<T>;
+	concept TriviallyMoveConstructible = std::is_trivially_move_constructible_v<T>;
+
+	template<class T>
+	concept TriviallyMoveAssignable = std::is_trivially_move_assignable_v<T>;
+
+	template<class T>
+	concept Trivial = TriviallyConstructible<T> and TriviallyDestructible<T> and TriviallyCopyable<T> and TriviallyMoveConstructible<T> and TriviallyMoveAssignable<T>;
 
 	template<class Function, class... Args>
 	concept Callable = std::invocable<Function, Args...>;