Rename "flags" design to "enum"

bemanproject · Feb 8, 2025 · da37e7b · da37e7b
1 parent bf85d28
commit da37e7b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -85,7 +85,7 @@ jobs:
       matrix:
         design:
         - description: Enum Flags
-          arg: -DBEMAN_ANY_VIEW_DESIGN=FLAGS
+          arg: -DBEMAN_ANY_VIEW_DESIGN=ENUM
         - description: Range Traits
           arg: -DBEMAN_ANY_VIEW_DESIGN=TRAITS
         - description: Named Template Arguments

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,9 +17,9 @@ option(
 
 # [CPP.NO_FLAG_FORKING]
 set(BEMAN_ANY_VIEW_DESIGN
-    "FLAGS"
+    "ENUM"
     CACHE STRING
-    "Enable alternative design for any_view_options. Default: FLAGS. Values: { FLAGS, TRAITS, NAMED }."
+    "Enable alternative design for any_view_options. Default: ENUM. Values: { ENUM, TRAITS, NAMED }."
 )
 
 set(BEMAN_ANY_VIEW_OPTION
@@ -28,22 +28,22 @@ set(BEMAN_ANY_VIEW_OPTION
     "Enable opt-in option for any_view. Default: COPYABLE. Values: { COPYABLE, MOVE_ONLY }."
 )
 
-set(BEMAN_ANY_VIEW_USE_FLAGS OFF)
+set(BEMAN_ANY_VIEW_USE_ENUM OFF)
 set(BEMAN_ANY_VIEW_USE_TRAITS OFF)
 set(BEMAN_ANY_VIEW_USE_NAMED OFF)
 set(BEMAN_ANY_VIEW_USE_COPYABLE OFF)
 set(BEMAN_ANY_VIEW_USE_MOVE_ONLY OFF)
 
-if(BEMAN_ANY_VIEW_DESIGN STREQUAL "FLAGS")
-    set(BEMAN_ANY_VIEW_USE_FLAGS ON)
+if(BEMAN_ANY_VIEW_DESIGN STREQUAL "ENUM")
+    set(BEMAN_ANY_VIEW_USE_ENUM ON)
 elseif(BEMAN_ANY_VIEW_DESIGN STREQUAL "TRAITS")
     set(BEMAN_ANY_VIEW_USE_TRAITS ON)
 elseif(BEMAN_ANY_VIEW_DESIGN STREQUAL "NAMED")
     set(BEMAN_ANY_VIEW_USE_NAMED ON)
 else()
     message(
         FATAL_ERROR
-        "BEMAN_ANY_VIEW_DESIGN must be one of { FLAGS, TRAITS, NAMED }; got ${BEMAN_ANY_VIEW_DESIGN}"
+        "BEMAN_ANY_VIEW_DESIGN must be one of { ENUM, TRAITS, NAMED }; got ${BEMAN_ANY_VIEW_DESIGN}"
     )
 endif()
 

diff --git a/include/beman/any_view/any_view.hpp b/include/beman/any_view/any_view.hpp
@@ -10,7 +10,7 @@
 #include <beman/any_view/detail/view_adaptor.hpp>
 #include <beman/any_view/detail/view_interface.hpp>
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 #include <beman/any_view/detail/type_traits.hpp>
 #include <beman/any_view/any_view_options.hpp>
@@ -37,7 +37,7 @@ concept viewable_range_compatible_with = not std::same_as<std::remove_cvref_t<Ra
 
 } // namespace detail
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 template <class ElementT,
           any_view_options OptionsV = any_view_options::input,
@@ -226,7 +226,7 @@ class any_view : public std::ranges::view_interface<any_view<ElementT, OptionsV>
 
 } // namespace beman::any_view
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 template <class ElementT, auto OptionsV, class RefT, class RValueRefT, class DiffT>
 inline constexpr bool

diff --git a/include/beman/any_view/any_view_options.hpp b/include/beman/any_view/any_view_options.hpp
@@ -5,7 +5,7 @@
 
 #include <beman/any_view/config.hpp>
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 #include <iterator>
 
@@ -19,7 +19,7 @@
 
 namespace beman::any_view {
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 enum class any_view_options {
     input                   = 0b0000000,

diff --git a/include/beman/any_view/config.hpp.in b/include/beman/any_view/config.hpp.in
@@ -3,7 +3,7 @@
 #ifndef BEMAN_ANY_VIEW_CONFIG_HPP
 #define BEMAN_ANY_VIEW_CONFIG_HPP
 
-#cmakedefine01 BEMAN_ANY_VIEW_USE_FLAGS()
+#cmakedefine01 BEMAN_ANY_VIEW_USE_ENUM()
 #cmakedefine01 BEMAN_ANY_VIEW_USE_TRAITS()
 #cmakedefine01 BEMAN_ANY_VIEW_USE_NAMED()
 

diff --git a/tests/beman/any_view/options.hpp b/tests/beman/any_view/options.hpp
@@ -5,7 +5,7 @@
 
 #include <beman/any_view/config.hpp>
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 #include <beman/any_view/any_view_options.hpp>
 

diff --git a/tests/beman/any_view/sfinae.test.cpp b/tests/beman/any_view/sfinae.test.cpp
@@ -75,7 +75,7 @@ struct traits : BaseTraitsT {
 };
 
 TEST(SfinaeTest, vector_of_bool) {
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::constructible_from<any_view<bool, random_access_options, bool>, std::vector<bool>>);
     static_assert(std::constructible_from<any_view<bool, sized_options, bool>, std::vector<bool>>);
     static_assert(not std::constructible_from<any_view<bool, borrowed_options, bool>, std::vector<bool>>);

diff --git a/tests/beman/any_view/type_traits.test.cpp b/tests/beman/any_view/type_traits.test.cpp
@@ -18,7 +18,7 @@ TEST(TypeTraitsTest, value_type) {
     static_assert(std::same_as<range_value_t<any_view<const value>>, value>);
 }
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
 
 using enum beman::any_view::any_view_options;
 
@@ -44,7 +44,7 @@ TEST(TypeTraitsTest, reference_type) {
     static_assert(std::same_as<range_reference_t<any_view<value>>, value&>);
     static_assert(std::same_as<range_reference_t<any_view<const value>>, const value&>);
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::same_as<range_reference_t<any_view<value, input, value>>, value>);
     static_assert(std::same_as<range_reference_t<any_view<value, input, lvalue>>, lvalue>);
 #elif BEMAN_ANY_VIEW_USE_TRAITS()
@@ -70,7 +70,7 @@ TEST(TypeTraitsTest, rvalue_reference_type) {
     static_assert(std::same_as<range_rvalue_reference_t<any_view<value>>, value&&>);
     static_assert(std::same_as<range_rvalue_reference_t<any_view<const value>>, const value&&>);
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::same_as<range_rvalue_reference_t<any_view<value, input, value>>, value>);
     static_assert(std::same_as<range_rvalue_reference_t<any_view<value, input, lvalue>>, lvalue>);
     static_assert(std::same_as<range_rvalue_reference_t<any_view<value, input, lvalue, rvalue>>, rvalue>);
@@ -101,7 +101,7 @@ TEST(TypeTraitsTest, difference_type) {
 
     static_assert(std::same_as<range_difference_t<any_view<value>>, std::ptrdiff_t>);
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::same_as<range_difference_t<any_view<value, input, lvalue, rvalue, short>>, short>);
 #elif BEMAN_ANY_VIEW_USE_TRAITS()
     static_assert(std::same_as<range_difference_t<any_view<value, difference_traits>>, short>);
@@ -128,7 +128,7 @@ struct sized_difference_traits : sized_traits {
 TEST(TypeTraitsTest, size_type) {
     using std::ranges::range_size_t;
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::same_as<range_size_t<any_view<value, input | sized>>, std::size_t>);
     static_assert(std::same_as<range_size_t<any_view<value, input | sized, value&, value&&, short>>, unsigned short>);
 #elif BEMAN_ANY_VIEW_USE_TRAITS()
@@ -159,7 +159,7 @@ TEST(TypeTraitsTest, borrowed_iterator_type) {
 
     static_assert(std::same_as<borrowed_iterator_t<any_view<value>>, std::ranges::dangling>);
 
-#if BEMAN_ANY_VIEW_USE_FLAGS()
+#if BEMAN_ANY_VIEW_USE_ENUM()
     static_assert(std::same_as<borrowed_iterator_t<any_view<value, input | borrowed>>,
                                iterator_t<any_view<value, input | borrowed>>>);
 #elif BEMAN_ANY_VIEW_USE_TRAITS()