From 02cdce39e2ca9f8ea34a8960f765d823b88fdd85 Mon Sep 17 00:00:00 2001
From: _Redstone_c_ <myredstone1024@gmail.com>
Date: Mon, 20 Feb 2023 18:53:59 +0800
Subject: [PATCH] feat(templates): add MakeAny() and fix MakeOptional()

---
 .../Source/Public/Templates/Any.h             | 28 +++++++++++++++++++
 .../Source/Public/Templates/Optional.h        | 19 +++++++++----
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/Redcraft.Utility/Source/Public/Templates/Any.h b/Redcraft.Utility/Source/Public/Templates/Any.h
index 93abb01..25929f3 100644
--- a/Redcraft.Utility/Source/Public/Templates/Any.h
+++ b/Redcraft.Utility/Source/Public/Templates/Any.h
@@ -599,6 +599,34 @@ static_assert(sizeof(FAny) == 64, "The byte size of FAny is unexpected");
 
 static_assert(alignof(FAny) == 16, "The byte alignment of FAny is unexpected");
 
+/** Creates an any object that does not contain a value. */
+template <typename T> requires (NAMESPACE_PRIVATE::CFAnyPlaceable<T>)
+NODISCARD FORCEINLINE constexpr FAny MakeAny(FInvalid)
+{
+	return FAny(Invalid);
+}
+
+/** Creates an any object from value. */
+template <typename T> requires (NAMESPACE_PRIVATE::CFAnyPlaceable<T> && CConstructibleFrom<TDecay<T>, T>)
+NODISCARD FORCEINLINE constexpr FAny MakeAny(T&& InValue)
+{
+	return FAny(Forward<T>(InValue));
+}
+
+/** Creates an any object constructed in-place from Args.... */
+template <typename T, typename... Ts> requires (NAMESPACE_PRIVATE::CFAnyPlaceable<T> && CConstructibleFrom<T, Ts...>)
+NODISCARD FORCEINLINE constexpr FAny MakeAny(Ts&&... Args)
+{
+	return FAny(InPlaceType<TDecay<T>>, Forward<T>(Args)...);
+}
+
+/** Creates an any object constructed in-place from IL, Args.... */
+template <typename T, typename U, typename... Ts> requires (NAMESPACE_PRIVATE::CFAnyPlaceable<T> && CConstructibleFrom<T, initializer_list<U>, Ts...>)
+NODISCARD FORCEINLINE constexpr FAny MakeAny(initializer_list<U> IL, Ts&&... Args)
+{
+	return FAny(InPlaceType<TDecay<T>>, IL, Forward<T>(Args)...);
+}
+
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/Templates/Optional.h b/Redcraft.Utility/Source/Public/Templates/Optional.h
index 87b472d..0f5b38f 100644
--- a/Redcraft.Utility/Source/Public/Templates/Optional.h
+++ b/Redcraft.Utility/Source/Public/Templates/Optional.h
@@ -377,25 +377,32 @@ TOptional(T) -> TOptional<T>;
 
 /** Creates an optional object that does not contain a value. */
 template <typename T> requires (CDestructible<T>)
-NODISCARD FORCEINLINE constexpr TOptional<TDecay<T>> MakeOptional(FInvalid)
+NODISCARD FORCEINLINE constexpr TOptional<T> MakeOptional(FInvalid)
 {
-	return TOptional<TDecay<T>>(Invalid);
+	return TOptional<T>(Invalid);
 }
 
 /** Creates an optional object from value. */
-template <typename T> requires (CDestructible<T> && CConstructibleFrom<T, T&&>)
-NODISCARD FORCEINLINE constexpr TOptional<T> MakeOptional(T&& InValue)
+template <typename T> requires (CDestructible<TDecay<T>> && CConstructibleFrom<TDecay<T>, T>)
+NODISCARD FORCEINLINE constexpr TOptional<TDecay<T>> MakeOptional(T&& InValue)
 {
-	return TOptional<T>(Forward<T>(InValue));
+	return TOptional<TDecay<T>>(Forward<T>(InValue));
 }
 
-/** Creates an optional object constructed in-place from args.... */
+/** Creates an optional object constructed in-place from Args.... */
 template <typename T, typename... Ts> requires (CDestructible<T> && CConstructibleFrom<T, Ts...>)
 NODISCARD FORCEINLINE constexpr TOptional<T> MakeOptional(Ts&&... Args)
 {
 	return TOptional<T>(InPlace, Forward<T>(Args)...);
 }
 
+/** Creates an optional object constructed in-place from IL, Args.... */
+template <typename T, typename U, typename... Ts> requires (CDestructible<T> && CConstructibleFrom<T, initializer_list<U>, Ts...>)
+NODISCARD FORCEINLINE constexpr TOptional<T> MakeOptional(initializer_list<U> IL, Ts&&... Args)
+{
+	return TOptional<T>(InPlace, IL, Forward<T>(Args)...);
+}
+
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END