RECURSIVE -> RECURSIVE_DEPTH_FIRST_ORDER

teslamotors · Aug 8, 2023 · 24224ad · 24224ad
1 parent 6f9e852
commit 24224ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/fixed_containers/reflection.hpp b/include/fixed_containers/reflection.hpp
@@ -181,7 +181,7 @@ constexpr void for_each_field_entry(const T& instance, Func func)
 enum class RecursionType
 {
     NON_RECURSIVE,
-    RECURSIVE,
+    RECURSIVE_DEPTH_FIRST_ORDER,
 };
 
 template <RecursionType RECURSION_TYPE, typename T>
@@ -191,7 +191,7 @@ constexpr std::size_t field_count_of(const T& instance)
     for_each_field_entry(instance,
                          [&counter](const FieldEntry& field_entry)
                          {
-                             if (RECURSION_TYPE == RecursionType::RECURSIVE or
+                             if (RECURSION_TYPE == RecursionType::RECURSIVE_DEPTH_FIRST_ORDER or
                                  field_entry.enclosing_field_name().empty())
                              {
                                  ++counter;
@@ -214,7 +214,7 @@ constexpr auto field_info_of(const T& instance) -> FixedVector<FieldEntry, MAXIM
     for_each_field_entry(instance,
                          [&output](const FieldEntry& field_entry)
                          {
-                             if (RECURSION_TYPE == RecursionType::RECURSIVE or
+                             if (RECURSION_TYPE == RecursionType::RECURSIVE_DEPTH_FIRST_ORDER or
                                  field_entry.enclosing_field_name().empty())
                              {
                                  output.push_back(field_entry);

diff --git a/test/reflection_test.cpp b/test/reflection_test.cpp
@@ -76,7 +76,7 @@ constexpr std::string_view pick_compiler_specific_string([[maybe_unused]] const
 TEST(Reflection, DebuggingHelper)
 {
     using enum reflection_detail::RecursionType;
-    auto foo = reflection_detail::field_info_of<RECURSIVE, MyColors>();
+    auto foo = reflection_detail::field_info_of<RECURSIVE_DEPTH_FIRST_ORDER, MyColors>();
     // std::cout << foo.size() << std::endl;
     (void)foo;
 }
@@ -128,9 +128,11 @@ TEST(Reflection, RecursiveExample)
     using enum reflection_detail::RecursionType;
 
     static_assert(
-        consteval_compare::equal<10, reflection_detail::field_count_of<RECURSIVE, MyColors>()>);
+        consteval_compare::
+            equal<10, reflection_detail::field_count_of<RECURSIVE_DEPTH_FIRST_ORDER, MyColors>()>);
 
-    constexpr auto FIELD_INFO = reflection_detail::field_info_of<RECURSIVE, MyColors>();
+    constexpr auto FIELD_INFO =
+        reflection_detail::field_info_of<RECURSIVE_DEPTH_FIRST_ORDER, MyColors>();
 
     static_assert(FIELD_INFO.at(0).field_type_name() == "int");
     static_assert(FIELD_INFO.at(0).field_name() == "yellow");