Fixed move from none bug in Optional

Author: Voltra

README.md

@@ -24,7 +24,7 @@ Here is the namespace hierarchy:
         * [prefixed](./include/scl/tool/iostream/log/prefixed.h) - Log w/ a prefix
         * [surrounded](./include/scl/tool/iostream/log/surrounded.h) - Log w/ a prefix & a suffix
         * [wrap](./include/scl/tool/iostream/log/log.hpp) - An alias for [scl::tools::iostream::log::surrounded](./include/scl/tool/iostream/log/surrounded.h)
-    * [meta](#scl-tools-meta) - Template Meta Programming utils (such as `void_t`, `enable_if_t` and `constexpr` functions like `is_same` or even handy stuff like `constexpr_assert`)
+    * [meta](./include/scl/tools/meta/meta.hpp) - Template Meta Programming utils (such as `void_t`, `enable_if_t` and `constexpr` functions like `is_same` or even handy stuff like `constexpr_assert`)
     * [console](./include/scl/tool/iostream/log/log.hpp) - An alias for [scl::tools::iostream::log](./include/scl/tool/iostream/log/log.hpp)
     * [cli](./include/scl/tool/iostream/log/log.hpp) - An alias for [scl::console](./include/scl/tool/iostream/log/log.hpp)
   * [exceptions](./include/scl/exceptions/exceptions.hpp) - Exception types used in the library
@@ -34,8 +34,8 @@ Here is the namespace hierarchy:
     * [creators](./include/scl/stream/creators/creators.hpp) - Grouping stream creation functions
     * [operators](./include/scl/stream/operators/operators.hpp) - Grouping intermediate stream operation functions
     * [terminators](./include/scl/stream/terminators/terminators.hpp) - Grouping end of stream operation functions 
-  * [async](./async/async.hpp) - The asynchronous programming API
-  * [http]( ./http/http.hpp ) - The HTTP API
+  * [async](./include/scl/async/async.hpp) - The asynchronous programming API
+  * [http]( ./include/scl/http/http.hpp ) - The HTTP API
 
 
 

include/scl/utils/Optional.h

@@ -20,10 +20,6 @@
 #include <scl/concepts/require.h>
 #include <scl/concepts/Movable.h>
 
-using scl::tools::iostream::nl;
-
-//TODO: Fix copy/move problems
-
 namespace scl{
 	namespace utils{
 		/**
@@ -68,23 +64,14 @@ namespace scl{
 		template <class T>
 		class Optional{
 			protected:
-				/**
-				 * @var valueFlag
-				 * determines whether or not there's a value inside this Optional<T>
-				 * @deprecated Replaced by the raw storage utility
-				 */
-				//bool valueFlag = false;
-
 				/**
 				 * @var payload
-				 * A raw strage to hold an instance of the object
+				 * A raw storage to hold an instance of the object
 				 */
-				RawStorage<T> payload = {};
+				RawStorage<T> payload;
 
 			public:
 				using value_type = META::remove_cv_ref_t<T>;
-				/*static constexpr bool is_movable = META::is_movable<value_type>();
-				static constexpr bool is_copyable =  META::is_copyable<value_type>();*/
 
 			public:
 				template <class... Args>
@@ -132,7 +119,6 @@ namespace scl{
 				 * @param value being the value to assign from
 				 */
 				Optional(const value_type& value){
-//					static_require(is_copyable);
 					this->payload.construct(value);
 				}
 
@@ -142,7 +128,6 @@ namespace scl{
 				 * @return a reference to this Optional
 				 */
 				Optional& operator=(const value_type& value){
-//					static_require(is_copyable);
 					this->payload.construct(value);
 					return *this;
 				}
@@ -152,7 +137,6 @@ namespace scl{
 				 * @param o being the Optional to copy from
 				 */
 				Optional(const Optional& o){
-//					static_require(is_copyable);
 					if(o.hasValue())
 						this->payload.construct(o.get());
 				};
@@ -163,7 +147,6 @@ namespace scl{
 				 * @return a reference to this Optional<T>
 				 */
 				Optional& operator=(const Optional& rhs){
-//					static_require(is_copyable);
 					if(rhs.hasValue())
 						this->payload.construct(rhs.get());
 
@@ -185,7 +168,6 @@ namespace scl{
 				 * (i.e. equivalent to one constructed from none)
 				 */
 				Optional(Optional&& rhs){
-//					static_require(is_movable);
 					if(rhs.hasValue())
 						this->payload = std::move(rhs.payload);
 				};
@@ -199,7 +181,6 @@ namespace scl{
 				 * (i.e. equivalent to one constructed from none)
 				 */
 				Optional& operator=(Optional&& rhs) noexcept{
-//					static_require(is_movable);
 					if(rhs.hasValue())
 						this->payload = std::move(rhs.payload);
 					return *this;
@@ -220,7 +201,7 @@ namespace scl{
 				 * @return a reference to this Optional
 				 */
 				Optional& operator=(None _){
-					this->payload = {};
+					this->payload.reset();
 					return *this;
 				}
 
@@ -517,13 +498,13 @@ namespace scl{
 #undef SCL_TPL
 		};
 
-		/*template <class T>
+		template <class T>
 		struct ToString<Optional<T>, META::enable_if_t<
 			META::defines_scl_to_string<T>()
 		>>{
 			std::string operator()(const Optional<T>& opt){
 				return opt.hasValue() ? asString(*opt) : asString(none);
 			}
-		};*/
+		};
 	}
 }

include/scl/utils/RawStorage.h

@@ -97,6 +97,15 @@ namespace scl{
 					this->destructor();
 				}
 
+				/**
+				 * Alias for RawStorage::destroy
+				 * @return a reference to this RawStorage
+				 */
+				RawStorage& reset(){
+					this->destroy();
+					return *this;
+				}
+
 				/**
 				 * Access the underlying data
 				 * @return a mutable reference to the underlying data

include/scl/utils/toString.h

@@ -7,6 +7,7 @@
 #include <scl/tools/meta/exists.h>
 #include <scl/tools/meta/type_mod.h>
 #include <scl/tools/meta/is_same.h>
+#include <scl/tools/meta/defines_std_to_string.h>
 
 namespace scl{
 	namespace utils{
@@ -34,6 +35,19 @@ namespace scl{
 			}
 		};
 
+		/**
+		 * Specialization for types that define std::to_string
+		 * @tparam T being the type of objects to convert to string
+		 */
+		template <class T>
+		struct ToString<T, META::void_t<META::enable_if_t<
+			META::defines_std_to_string<T>()
+		>>>{
+			std::string operator()(const T& t) const{
+				return std::to_string(t);
+			}
+		};
+
 		/**
 		 * Free function that allows string conversion
 		 * @tparam T the type of object to convert to string

main.cpp

@@ -84,7 +84,7 @@ struct Person{
 
 void testsConcepts(){
 	require(Iterator<int*>{});
-	require(SwappableWith<int, int>{});
+//	require(SwappableWith<int, int>{});
 }
 
 void testsMake(){
@@ -170,10 +170,9 @@ void testHTTP(){
 }
 
 int main(){
-	//TODO: Fix references bug (undef ref / empty optional access)
 	//testsStream();
 
-//	std::cout << asString(42) << nl;
-//	std::cout << Optional<int>{42} << nl;
+	std::cout << asString(42) << nl;
+	std::cout << make::optional<int>(42) << nl;
 	std::cout << make::any<stringLiteral>("Yes").as<stringLiteral>() << nl;
 }

tests/unittest/utils/OptionalTests.cpp

@@ -21,13 +21,6 @@ using namespace scl::tools;
 using scl::tools::iostream::nl;
 
 TEST(OptionalTests, ConceptsRequirementsMet) {
-	/*{
-		Optional<int> o = 42;
-		Optional<int> x{o};
-		x = o;
-		std::cout << "x: " << x.get() << ", o: " << o.get() << nl;
-	}*/
-
 	ASSERT_TRUE(DefaultConstructible<Optional<int>>{});
 	ASSERT_TRUE(Movable<Optional<int>>{});
 	ASSERT_TRUE(Copyable<Optional<int>>{});
@@ -41,12 +34,14 @@ TEST(OptionalTests, ConceptsRequirementsMet) {
 
 TEST(OptionalTests, CanConstructFromNone){
 	Optional<int> o{none};
+	SUCCEED();
 }
 
 TEST(OptionalTests, CanAssignFromNone){
 	Optional<int> o = none;
 	Optional<int> op;
 	op = none;
+	SUCCEED();
 }
 
 TEST(OptionalTests, CanUseNonTriviallyCopyableType){
@@ -78,7 +73,6 @@ TEST(OptionalTests, MovedFromHasCorrectSemantics){
 		Optional<std::string> no = none;
 		auto a = std::move(no);
 
-		//ASSERT_EQ(a.hasValue(), no.hasValue());
 		ASSERT_FALSE(no.hasValue());
 	}
 
@@ -199,29 +193,21 @@ TEST(OptionalTests, ThrowsGivenExceptionOnEmpty){
 	ASSERT_THROW(o.orThrow(e), decltype(e));
 }
 
-/* //Disabled test because it cannot be true
-TEST(OptionalTests, AdvancedInvalidTypesHaveWellDefinedBehavior){
-	using nmnc = Optional<NonCopyableNonMovable_t>;
-
-	ASSERT_EQ(META::is_copyable<NonCopyableNonMovable_t>(), META::is_copyable<nmnc>());
-	ASSERT_EQ(META::is_movable<NonCopyableNonMovable_t>(), META::is_movable<nmnc>());
-}*/
-
 TEST(OptionalTests, NoneFunctionCalledIfEmptyNotIfPresent){
 	Optional<int> o = none;
 	o.doIfPresent([](const int& _){ //shouldn't be called
-		ASSERT_TRUE(false);
+		FAIL();
 	}).doIfEmpty([]{ //should be called
-		ASSERT_TRUE(true);
+		SUCCEED();
 	});
 }
 
 TEST(OptionalTests, ValueFunctionCalledIfPresentNotIfEmpty){
 	Optional<int> o = 42;
 	o.doIfPresent([](const int& _){ //should be called
-		ASSERT_TRUE(true);
+		SUCCEED();
 	}).doIfEmpty([]{ //shouldn't be called
-		ASSERT_TRUE(false);
+		FAIL();
 	});
 }