BlackMATov/enum.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/enum.hpp.git synced 2025-12-15 11:53:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

add from_XXX_or_default, from_XXX_or_throw traits functions

Browse Source
This commit is contained in:
Matvey Cherevko
2019-11-22 05:21:16 +07:00
parent c0497c2e5d
commit c783f22be3
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headers/enum.hpp/enum.hpp
View File

@@ -158,6 +158,18 @@ namespace enum_hpp::detail
}\ }\
return std::nullopt;\ return std::nullopt;\
}\ }\
static constexpr Enum from_string_or_default(std::string_view name, Enum def) noexcept {\
if ( auto e = from_string(name) ) {\
return *e;\
}\
return def;\
}\
static Enum from_string_or_throw(std::string_view name) {\
if ( auto e = from_string(name) ) {\
return *e;\
}\
throw ::enum_hpp::exception(#Enum "_traits::from_string_or_throw(): invalid argument");\
}\
\ \
static constexpr std::optional<std::size_t> to_index(Enum e) noexcept {\ static constexpr std::optional<std::size_t> to_index(Enum e) noexcept {\
for ( std::size_t i = 0; i < size; ++i ) {\ for ( std::size_t i = 0; i < size; ++i ) {\
@@ -187,6 +199,18 @@ namespace enum_hpp::detail
}\ }\
return std::nullopt;\ return std::nullopt;\
}\ }\
static constexpr Enum from_index_or_default(std::size_t index, Enum def) noexcept {\
if ( auto e = from_index(index) ) {\
return *e;\
}\
return def;\
}\
static Enum from_index_or_throw(std::size_t index) {\
if ( auto e = from_index(index) ) {\
return *e;\
}\
throw ::enum_hpp::exception(#Enum "_traits::from_index_or_throw(): invalid argument");\
}\
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

22
untests/enum_tests.cpp
View File

@@ -186,7 +186,18 @@ TEST_CASE("enum") {
STATIC_REQUIRE(sn::color_traits::from_string("red") == sn::color::red); STATIC_REQUIRE(sn::color_traits::from_string("red") == sn::color::red);
STATIC_REQUIRE(sn::color_traits::from_string("green") == sn::color::green); STATIC_REQUIRE(sn::color_traits::from_string("green") == sn::color::green);
STATIC_REQUIRE(sn::color_traits::from_string("blue") == sn::color::blue); STATIC_REQUIRE(sn::color_traits::from_string("blue") == sn::color::blue);
STATIC_REQUIRE(sn::color_traits::from_string_or_default("red", sn::color::green) == sn::color::red);
STATIC_REQUIRE(sn::color_traits::from_string_or_default("green", sn::color::red) == sn::color::green);
STATIC_REQUIRE(sn::color_traits::from_string_or_default("blue", sn::color::red) == sn::color::blue);
REQUIRE(sn::color_traits::from_string_or_throw("red") == sn::color::red);
REQUIRE(sn::color_traits::from_string_or_throw("green") == sn::color::green);
REQUIRE(sn::color_traits::from_string_or_throw("blue") == sn::color::blue);
STATIC_REQUIRE_FALSE(sn::color_traits::from_string("42")); STATIC_REQUIRE_FALSE(sn::color_traits::from_string("42"));
STATIC_REQUIRE(sn::color_traits::from_string_or_default("42", sn::color::red) == sn::color::red);
REQUIRE_THROWS_AS(sn::color_traits::from_string_or_throw("42"), enum_hpp::exception);
} }
{ {
STATIC_REQUIRE(sn::render::mask_traits::from_string("none") == sn::render::mask::none); STATIC_REQUIRE(sn::render::mask_traits::from_string("none") == sn::render::mask::none);
@@ -260,7 +271,18 @@ TEST_CASE("enum") {
STATIC_REQUIRE(sn::color_traits::from_index(0) == sn::color::red); STATIC_REQUIRE(sn::color_traits::from_index(0) == sn::color::red);
STATIC_REQUIRE(sn::color_traits::from_index(1) == sn::color::green); STATIC_REQUIRE(sn::color_traits::from_index(1) == sn::color::green);
STATIC_REQUIRE(sn::color_traits::from_index(2) == sn::color::blue); STATIC_REQUIRE(sn::color_traits::from_index(2) == sn::color::blue);
STATIC_REQUIRE(sn::color_traits::from_index_or_default(0, sn::color::green) == sn::color::red);
STATIC_REQUIRE(sn::color_traits::from_index_or_default(1, sn::color::red) == sn::color::green);
STATIC_REQUIRE(sn::color_traits::from_index_or_default(2, sn::color::red) == sn::color::blue);
REQUIRE(sn::color_traits::from_index_or_throw(0) == sn::color::red);
REQUIRE(sn::color_traits::from_index_or_throw(1) == sn::color::green);
REQUIRE(sn::color_traits::from_index_or_throw(2) == sn::color::blue);
STATIC_REQUIRE_FALSE(sn::color_traits::from_index(42)); STATIC_REQUIRE_FALSE(sn::color_traits::from_index(42));
STATIC_REQUIRE(sn::color_traits::from_index_or_default(42, sn::color::red) == sn::color::red);
REQUIRE_THROWS_AS(sn::color_traits::from_index_or_throw(42), enum_hpp::exception);
} }
{ {
STATIC_REQUIRE(sn::render::mask_traits::from_index(0) == sn::render::mask::none); STATIC_REQUIRE(sn::render::mask_traits::from_index(0) == sn::render::mask::none);