coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-06 16:56:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 56b5048b92dad960418074b6ed10f705be27a480 into 520d8ee39037c9c94aa6e708a4fd6c0fa313ae80

Browse Source
This commit is contained in:
Thomas BRUNEL 2024-01-10 04:59:43 -07:00 committed by GitHub
commit dad7280952
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
enum.h
View File

@ -943,16 +943,48 @@ inline bool operator <(const Enum &a, const Enum &b) \
{ return a._to_integral() < b._to_integral(); } \ { return a._to_integral() < b._to_integral(); } \
\ \
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \ BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator <(const Enum &a, const Enum::_enumerated &b) \
{ return a._to_integral() < b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator <(const Enum::_enumerated &a, const Enum &b) \
{ return a < b._to_integral(); } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator <=(const Enum &a, const Enum &b) \ inline bool operator <=(const Enum &a, const Enum &b) \
{ return a._to_integral() <= b._to_integral(); } \ { return a._to_integral() <= b._to_integral(); } \
\ \
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \ BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator <=(const Enum &a, const Enum::_enumerated &b) \
{ return a._to_integral() <= b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator <=(const Enum::_enumerated &a, const Enum &b) \
{ return a <= b._to_integral(); } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >(const Enum &a, const Enum &b) \ inline bool operator >(const Enum &a, const Enum &b) \
{ return a._to_integral() > b._to_integral(); } \ { return a._to_integral() > b._to_integral(); } \
\ \
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \ BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >(const Enum &a, const Enum::_enumerated &b) \
{ return a._to_integral() > b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >(const Enum::_enumerated &a, const Enum &b) \
{ return a > b._to_integral(); } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >=(const Enum &a, const Enum &b) \ inline bool operator >=(const Enum &a, const Enum &b) \
{ return a._to_integral() >= b._to_integral(); } \ { return a._to_integral() >= b._to_integral(); } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >=(const Enum &a, const Enum::_enumerated &b) \
{ return a._to_integral() >= b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator >=(const Enum::_enumerated &a, const Enum &b) \
{ return a >= b._to_integral(); } \
BETTER_ENUMS_IGNORE_ATTRIBUTES_END \ BETTER_ENUMS_IGNORE_ATTRIBUTES_END \
\ \
\ \

46
test/cxxtest/general.h
View File

@ -200,7 +200,7 @@ class EnumTests : public CxxTest::TestSuite {
TS_ASSERT_EQUALS(Channel::_from_integral_unchecked(1), +Channel::Green); TS_ASSERT_EQUALS(Channel::_from_integral_unchecked(1), +Channel::Green);
TS_ASSERT_DIFFERS(Channel::_from_integral_unchecked(1), +Channel::Blue); TS_ASSERT_DIFFERS(Channel::_from_integral_unchecked(1), +Channel::Blue);
TS_ASSERT_THROWS(Channel::_from_integral(3), std::runtime_error); TS_ASSERT_THROWS(Channel::_from_integral(3), std::runtime_error const&);
TS_ASSERT_THROWS_NOTHING(Channel::_from_integral_unchecked(3)); TS_ASSERT_THROWS_NOTHING(Channel::_from_integral_unchecked(3));
better_enums::optional<Channel> maybe_channel = better_enums::optional<Channel> maybe_channel =
@ -225,7 +225,7 @@ class EnumTests : public CxxTest::TestSuite {
TS_ASSERT_DIFFERS(Channel::_from_string("Green"), +Channel::Blue); TS_ASSERT_DIFFERS(Channel::_from_string("Green"), +Channel::Blue);
TS_ASSERT_EQUALS(Channel::_from_string("Blue"), +Channel::Blue); TS_ASSERT_EQUALS(Channel::_from_string("Blue"), +Channel::Blue);
TS_ASSERT_DIFFERS(Channel::_from_string("Blue"), +Channel::Green); TS_ASSERT_DIFFERS(Channel::_from_string("Blue"), +Channel::Green);
TS_ASSERT_THROWS(Channel::_from_string("green"), std::runtime_error); TS_ASSERT_THROWS(Channel::_from_string("green"), std::runtime_error const&);
better_enums::optional<Channel> maybe_channel = better_enums::optional<Channel> maybe_channel =
Channel::_from_string_nothrow("Green"); Channel::_from_string_nothrow("Green");
@ -241,7 +241,7 @@ class EnumTests : public CxxTest::TestSuite {
+Channel::Blue); +Channel::Blue);
TS_ASSERT_DIFFERS(Channel::_from_string_nocase("blue"), TS_ASSERT_DIFFERS(Channel::_from_string_nocase("blue"),
+Channel::Green); +Channel::Green);
TS_ASSERT_THROWS(Channel::_from_string_nocase("a"), std::runtime_error); TS_ASSERT_THROWS(Channel::_from_string_nocase("a"), std::runtime_error const&);
maybe_channel = Channel::_from_string_nocase_nothrow("green"); maybe_channel = Channel::_from_string_nocase_nothrow("green");
TS_ASSERT(maybe_channel); TS_ASSERT(maybe_channel);
@ -354,16 +354,16 @@ class EnumTests : public CxxTest::TestSuite {
TS_ASSERT_EQUALS((+Channel::Red), Channel::_from_index(0)); TS_ASSERT_EQUALS((+Channel::Red), Channel::_from_index(0));
TS_ASSERT_EQUALS((+Channel::Green), Channel::_from_index(1)); TS_ASSERT_EQUALS((+Channel::Green), Channel::_from_index(1));
TS_ASSERT_EQUALS((+Channel::Blue), Channel::_from_index(2)); TS_ASSERT_EQUALS((+Channel::Blue), Channel::_from_index(2));
TS_ASSERT_THROWS(Channel::_from_index(42), std::runtime_error); TS_ASSERT_THROWS(Channel::_from_index(42), std::runtime_error const&);
TS_ASSERT_EQUALS((+Depth::HighColor), Depth::_from_index(0)); TS_ASSERT_EQUALS((+Depth::HighColor), Depth::_from_index(0));
TS_ASSERT_EQUALS((+Depth::TrueColor), Depth::_from_index(1)); TS_ASSERT_EQUALS((+Depth::TrueColor), Depth::_from_index(1));
TS_ASSERT_THROWS(Depth::_from_index(42), std::runtime_error); TS_ASSERT_THROWS(Depth::_from_index(42), std::runtime_error const&);
TS_ASSERT_EQUALS((+Compression::None), Compression::_from_index(0)); TS_ASSERT_EQUALS((+Compression::None), Compression::_from_index(0));
TS_ASSERT_EQUALS((+Compression::Huffman), Compression::_from_index(1)); TS_ASSERT_EQUALS((+Compression::Huffman), Compression::_from_index(1));
TS_ASSERT_EQUALS((+Compression::Default), Compression::_from_index(2)); TS_ASSERT_EQUALS((+Compression::Default), Compression::_from_index(2));
TS_ASSERT_THROWS(Compression::_from_index(42), std::runtime_error); TS_ASSERT_THROWS(Compression::_from_index(42), std::runtime_error const&);
} }
void test_from_index_nothrow() void test_from_index_nothrow()
@ -412,7 +412,6 @@ class EnumTests : public CxxTest::TestSuite {
void test_from_index_unchecked() void test_from_index_unchecked()
{ {
TS_ASSERT_EQUALS((+Channel::Red), Channel::_from_index_unchecked(0)); TS_ASSERT_EQUALS((+Channel::Red), Channel::_from_index_unchecked(0));
TS_ASSERT_EQUALS((+Channel::Green), Channel::_from_index_unchecked(1)); TS_ASSERT_EQUALS((+Channel::Green), Channel::_from_index_unchecked(1));
TS_ASSERT_EQUALS((+Channel::Blue), Channel::_from_index_unchecked(2)); TS_ASSERT_EQUALS((+Channel::Blue), Channel::_from_index_unchecked(2));
@ -424,6 +423,39 @@ class EnumTests : public CxxTest::TestSuite {
TS_ASSERT_EQUALS((+Compression::Huffman), Compression::_from_index_unchecked(1)); TS_ASSERT_EQUALS((+Compression::Huffman), Compression::_from_index_unchecked(1));
TS_ASSERT_EQUALS((+Compression::Default), Compression::_from_index_unchecked(2)); TS_ASSERT_EQUALS((+Compression::Default), Compression::_from_index_unchecked(2));
} }
void test_comparator_operators()
{
Channel red = Channel::Red, blue = Channel::Blue;
TS_ASSERT_LESS_THAN(red, Channel::Green);
TS_ASSERT_LESS_THAN(Channel::Green, blue);
TS_ASSERT(!(red < Channel::Red));
TS_ASSERT(!(Channel::Blue < blue));
TS_ASSERT(!(blue < Channel::Green));
TS_ASSERT(!(Channel::Green < red));
TS_ASSERT_LESS_THAN_EQUALS(red, Channel::Green);
TS_ASSERT_LESS_THAN_EQUALS(Channel::Green, blue);
TS_ASSERT_LESS_THAN_EQUALS(red, Channel::Red);
TS_ASSERT_LESS_THAN_EQUALS(Channel::Blue, blue);
TS_ASSERT(!(blue <= Channel::Green));
TS_ASSERT(!(Channel::Green <= red));
TS_ASSERT(!(red > Channel::Green));
TS_ASSERT(!(Channel::Green > blue));
TS_ASSERT(!(red > Channel::Red));
TS_ASSERT(!(Channel::Blue > blue));
TS_ASSERT(blue > Channel::Green);
TS_ASSERT(Channel::Green > red);
TS_ASSERT(!(red >= Channel::Green));
TS_ASSERT(!(Channel::Green >= blue));
TS_ASSERT(red >= Channel::Red);
TS_ASSERT(Channel::Blue >= blue);
TS_ASSERT(blue >= Channel::Green);
TS_ASSERT(Channel::Green >= red);
}
}; };