From 1954f976665a751a90da002ca153d068b1187252 Mon Sep 17 00:00:00 2001
From: kayomn <kayomn@kayomn.net>
Date: Tue, 28 Feb 2023 16:02:51 +0000
Subject: [PATCH] Refactor coral::closure constraints

---
 source/coral.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/coral.cpp b/source/coral.cpp
index 1b3f364..139c8a1 100755
--- a/source/coral.cpp
+++ b/source/coral.cpp
@@ -319,20 +319,22 @@ export namespace coral {
 	 * lifetime of any functor assigned to it.
 	 */
 	template<typename result, typename... arguments> struct closure<result(arguments...)> {
-		template<typename callable> closure(callable call) requires function_pointer<callable, arguments...> {
-			this->dispatch = [](void * context, arguments... dispatch_arguments) -> result {
-				return (reinterpret_cast<callable>(context))(dispatch_arguments...);
-			};
+		template<typename callable> closure(callable && call)
+			requires (functor<callable, arguments...> || function_pointer<callable, arguments...>) {
 
-			this->context = reinterpret_cast<void *>(call);
-		}
+			if constexpr (functor<callable, arguments...>) {
+				this->dispatch = [](void * context, arguments... dispatch_arguments) -> result {
+					return (*reinterpret_cast<callable *>(context))(dispatch_arguments...);
+				};
 
-		template<typename callable> closure(callable && call) requires functor<callable, arguments...> {
-			this->dispatch = [](void * context, arguments... dispatch_arguments) -> result {
-				return (*reinterpret_cast<callable *>(context))(dispatch_arguments...);
-			};
+				this->context = &call;
+			} else if constexpr (function_pointer<callable, arguments...>) {
+				this->dispatch = [](void * context, arguments... dispatch_arguments) -> result {
+					return (reinterpret_cast<callable>(context))(dispatch_arguments...);
+				};
 
-			this->context = &call;
+				this->context = reinterpret_cast<void *>(call);
+			}
 		}
 
 		template<typename callable> closure(callable & call) requires functor<callable, arguments...> {