Simplify code

Author: ZXShady

include/rfl/enums.hpp

@@ -7,25 +7,25 @@
 #include "internal/enums/StringConverter.hpp"
 #include "internal/enums/get_enum_names.hpp"
 #include "internal/enums/is_flag_enum.hpp"
-#include "internal/enums/is_scoped_enum.hpp"
+#include "thirdparty/enchantum.hpp"
 
 namespace rfl {
 
 // Converts an enum value to a string.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 std::string enum_to_string(EnumType _enum) {
   return rfl::internal::enums::StringConverter<EnumType>::enum_to_string(_enum);
 }
 
 // Converts a string to a value of the given enum type.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 rfl::Result<EnumType> string_to_enum(const std::string& _str) {
   return rfl::internal::enums::StringConverter<EnumType>::string_to_enum(_str);
 }
 
 // Returns a named tuple mapping names of enumerators of the given enum type to
 // their values.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 auto get_enumerators() {
   constexpr auto names = internal::enums::get_enum_names<
       EnumType, internal::enums::is_flag_enum<EnumType>>();
@@ -34,7 +34,7 @@ auto get_enumerators() {
 
 // Returns a named tuple mapping names of enumerators of the given enum type to
 // their underlying values.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 auto get_underlying_enumerators() {
   constexpr auto names = internal::enums::get_enum_names<
       EnumType, internal::enums::is_flag_enum<EnumType>>();
@@ -43,7 +43,7 @@ auto get_underlying_enumerators() {
 
 // Returns an std::array containing pairs of enumerator names (as
 // std::string_view) and values.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 constexpr auto get_enumerator_array() {
   constexpr auto names = internal::enums::get_enum_names<
       EnumType, internal::enums::is_flag_enum<EnumType>>();
@@ -52,15 +52,15 @@ constexpr auto get_enumerator_array() {
 
 // Returns an std::array containing pairs of enumerator names (as
 // std::string_view) and underlying values.
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 constexpr auto get_underlying_enumerator_array() {
   constexpr auto names = internal::enums::get_enum_names<
       EnumType, internal::enums::is_flag_enum<EnumType>>();
   return internal::enums::names_to_underlying_enumerator_array(names);
 }
 
 // Returns the range of the given enum type as a pair of the minimum and maximum
-template <internal::enums::is_scoped_enum EnumType>
+template <enchantum::Enum EnumType>
 constexpr auto get_enum_range() {
   return std::make_pair(
       internal::enums::get_range_min<EnumType,

include/rfl/internal/enums/Names.hpp

@@ -2,15 +2,15 @@
 #define RFL_INTERNAL_ENUMS_NAMES_HPP_
 
 // Enum values must be greater than or equal to RFL_ENUM_RANGE_MIN.
-// By default, RFL_ENUM_RANGE_MIN is set to 0.
+// By default, RFL_ENUM_RANGE_MIN is set to -256.
 // To change the default minimum range for all enum types, redefine the macro
 // RFL_ENUM_RANGE_MIN.
 #if !defined(RFL_ENUM_RANGE_MIN)
 #define RFL_ENUM_RANGE_MIN -256
 #endif
 
 // Enum values must be less than or equal to RFL_ENUM_RANGE_MAX.
-// By default, RFL_ENUM_RANGE_MAX is set to 127.
+// By default, RFL_ENUM_RANGE_MAX is set to 256.
 // To change the default maximum range for all enum types, redefine the macro
 // RFL_ENUM_RANGE_MAX.
 #if !defined(RFL_ENUM_RANGE_MAX)

include/rfl/internal/enums/get_enum_names.hpp

@@ -66,46 +66,19 @@ consteval auto get_range_max() {
   }
 }
 
-struct str_view_agg {
-  const char* data;
-  std::size_t size;
-};
-
 template <enchantum::Enum EnumType, bool _is_flag>
 consteval auto get_enum_names() {
-  // constexpr auto max = get_range_max<EnumType, _is_flag>();
-  // constexpr auto min = get_range_min<EnumType, _is_flag>();
-  // constexpr auto range_size = max - min + 1;
-  //
-  // static_assert(range_size > 0,
-  //               "enum_range requires a valid range size. Ensure that max is "
-  //               "greater than min.");
-  //
-  // using EmptyNames = Names<EnumType, rfl::Literal<"">, 0, _is_flag>;
-
-  constexpr auto convert = []() {
-    constexpr auto a = enchantum::entries<EnumType>;
-    std::array<std::pair<EnumType, str_view_agg>, a.size()> b;
-    for (std::size_t i = 0; i < a.size(); ++i) {
-      b[i].first = a[i].first;
-      b[i].second = {a[i].second.data(), a[i].second.size()};
-    }
-    return b;
-  }();
-
-  // return Names<E, Literal<"">, sizeof...(entries), _is_flag,
-  // entries.first...>{};
-
-  return [convert]<std::size_t... Is>(std::index_sequence<Is...>) {
+  return []<std::size_t... Is>(std::index_sequence<Is...>) {
+    constexpr auto& entries = enchantum::entries<EnumType>;
     constexpr auto to_str_lit =
         []<std::size_t... Js>(const char* name, std::index_sequence<Js...>) {
           return StringLiteral<sizeof...(Js) + 1>{name[Js]...};
         };
     return Names<EnumType,
                  Literal<to_str_lit(
-                     convert[Is].second.data,
-                     std::make_index_sequence<convert[Is].second.size>{})...>,
-                 convert.size(), _is_flag, convert[Is].first...>{};
+                     entries[Is].second.data(),
+                     std::make_index_sequence<entries[Is].second.size()>{})...>,
+                 entries.size(), _is_flag, entries[Is].first...>{};
   }(std::make_index_sequence<enchantum::count<EnumType>>{});
 }
 }  // namespace rfl::internal::enums

include/rfl/internal/enums/is_flag_enum.hpp

@@ -3,7 +3,6 @@
 
 #include <concepts>
 
-#include "is_scoped_enum.hpp"
 #include "../../thirdparty/enchantum.hpp"
 template<enchantum::Enum E>
 requires requires(E e) {
@@ -17,7 +16,7 @@ namespace enums {
 
 template <class EnumType>
 concept is_flag_enum =
-    is_scoped_enum<EnumType> && enchantum::BitFlagEnum<EnumType>;
+    enchantum::ScopedEnum<EnumType> && enchantum::BitFlagEnum<EnumType>;
 
 
 }  // namespace enums