[brief] Allow enum bitfield to receive assignment of the base type.

[detailed] - Mostly for symmetry with the other function.
marovira · Jun 27, 2024 · 5a0ab05 · 5a0ab05
1 parent cfda2d8
commit 5a0ab05
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/include/zeus/enum_bitfield.hpp b/include/zeus/enum_bitfield.hpp
@@ -26,6 +26,12 @@ namespace zeus
             return *this;
         }
 
+        constexpr EnumBitfield& operator=(BaseType field)
+        {
+            m_field = field;
+            return *this;
+        }
+
         constexpr BaseType bits() const
         {
             return m_field;

diff --git a/test/enum_bitfield_test.cpp b/test/enum_bitfield_test.cpp
@@ -59,20 +59,44 @@ TEST_CASE("[EnumBitfield] - operator=", "[zeus]")
 {
     SECTION("Runtime")
     {
-        EnumBitfield<Bits> a;
-        a = Bits::b;
-        REQUIRE(a.bits() == 2);
+        SECTION("From enum")
+        {
+            EnumBitfield<Bits> a;
+            a = Bits::b;
+            REQUIRE(a.bits() == 2);
+        }
+
+        SECTION("From base type")
+        {
+            EnumBitfield<Bits> a;
+            a = 2;
+            REQUIRE(a.bits() == 2);
+        }
     }
 
     SECTION("Compile-time")
     {
-        static constexpr auto val = []() {
-            EnumBitfield<Bits> a;
-            a = Bits::b;
-            return a.bits();
-        }();
+        SECTION("From enum")
+        {
+            static constexpr auto val = []() {
+                EnumBitfield<Bits> a;
+                a = Bits::b;
+                return a.bits();
+            }();
 
-        STATIC_REQUIRE(val == 2);
+            STATIC_REQUIRE(val == 2);
+        }
+
+        SECTION("From base type")
+        {
+            static constexpr auto val = []() {
+                EnumBitfield<Bits> a;
+                a = 2;
+                return a.bits();
+            }();
+
+            STATIC_REQUIRE(val == 2);
+        }
     }
 }