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

Add equality operators to compare Enum with enumerated value

Browse Source
This commit is contained in:
gamante91 2022-12-09 19:03:47 +01:00
parent 1e8f499ddf
commit c4fa43f9b8
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
enum.h
View File

@ -934,6 +934,22 @@ 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, Enum::_enumerated b) \
{ return a._to_integral() == b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator ==(Enum::_enumerated a, const Enum &b) \
{ return a == b._to_integral(); } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator =!(const Enum &a, Enum::_enumerated b) \
{ return a._to_integral() =! b; } \
\
BETTER_ENUMS_UNUSED BETTER_ENUMS_CONSTEXPR_ \
inline bool operator =!(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(); } \
\ \

28
test/cxxtest/general.h
View File

@ -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,33 @@ 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_equality_operators() {
Channel red = Channel::Red, green = Channel::Green, blue = Channel::Blue;
TS_ASSERT_EQUALS(red, Channel::Red);
TS_ASSERT_EQUALS(blue, Channel::Blue);
TS_ASSERT_EQUALS(green, Channel::Green);
TS_ASSERT_EQUALS(Channel::Red, red);
TS_ASSERT_EQUALS(Channel::Blue, blue);
TS_ASSERT_EQUALS(Channel::Green, green);
TS_ASSERT_DIFFERS(red, Channel::Green);
TS_ASSERT_DIFFERS(red, Channel::Blue);
TS_ASSERT_DIFFERS(Channel::Green, red);
TS_ASSERT_DIFFERS(Channel::Blue, red);
TS_ASSERT_DIFFERS(green, Channel::Red);
TS_ASSERT_DIFFERS(green, Channel::Blue);
TS_ASSERT_DIFFERS(Channel::Red, green);
TS_ASSERT_DIFFERS(Channel::Blue, green);
TS_ASSERT_DIFFERS(blue, Channel::Red);
TS_ASSERT_DIFFERS(blue, Channel::Green);
TS_ASSERT_DIFFERS(Channel::Red, blue);
TS_ASSERT_DIFFERS(Channel::Green, blue);
}
}; };