Fix all warnings in enumeration details code/tests

1 files changed, 45 insertions, 57 deletions

diff --git a/lib/enumDetails.h b/lib/enumDetails.h
index dfae082..49906d4 100644
--- a/lib/enumDetails.h
+++ b/lib/enumDetails.h
@@ -9,11 +9,11 @@
 /// EnumDetailsBase
 // Shared helpers
 struct EnumDetailsBase {
-	template<size_t len>
+	template<size_t Len>
 	constexpr static auto
 	strArr(auto input, auto start, auto end)
 	{
-		std::array<char, len> out;
+		std::array<char, Len> out;
 		input.copy(out.begin(), end - start, start);
 		return out;
 	}
@@ -33,22 +33,22 @@ protected:
 		return std::string_view {__PRETTY_FUNCTION__};
 	};
 
-	constexpr static auto typeNameStart {typeraw().find(SEARCH_TYPE) + SEARCH_TYPE.length()};
-	constexpr static auto typeNameEnd {typeraw().find_first_of("];", typeNameStart)};
-	constexpr static auto typeNameLen {typeNameEnd - typeNameStart};
-	constexpr static auto typeNameArr {strArr<typeNameLen>(typeraw(), typeNameStart, typeNameEnd)};
+	constexpr static auto TYPE_NAME_START {typeraw().find(SEARCH_TYPE) + SEARCH_TYPE.length()};
+	constexpr static auto TYPE_NAME_END {typeraw().find_first_of("];", TYPE_NAME_START)};
+	constexpr static auto TYPE_NAME_LEN {TYPE_NAME_END - TYPE_NAME_START};
+	constexpr static auto TYPE_NAME_ARR {strArr<TYPE_NAME_LEN>(typeraw(), TYPE_NAME_START, TYPE_NAME_END)};
 
 public:
-	constexpr static std::string_view typeName {typeNameArr.data(), typeNameArr.size()};
+	constexpr static std::string_view TYPE_NAME {TYPE_NAME_ARR.data(), TYPE_NAME_ARR.size()};
 };
 
 /// EnumValueDetails
 // Extracts the value name and constructs string_views of the parts
-template<auto value> struct EnumValueDetails : public EnumTypeDetails<decltype(value)> {
+template<auto Value> struct EnumValueDetails : public EnumTypeDetails<decltype(Value)> {
 #ifndef ENUM_PROBE
 private:
 #endif
-	using T = EnumTypeDetails<decltype(value)>;
+	using T = EnumTypeDetails<decltype(Value)>;
 
 	constexpr static auto
 	raw()
@@ -56,26 +56,23 @@ private:
 		return std::string_view {__PRETTY_FUNCTION__};
 	};
 
-	constexpr static auto nameStart {raw().find_last_of(": ") + 1};
-	constexpr static auto nameEnd {raw().find_first_of("];", nameStart)};
-	constexpr static auto nameLen {nameEnd - nameStart};
-	constexpr static auto nameArr {EnumValueDetails::template strArr<nameLen>(raw(), nameStart, nameEnd)};
+	constexpr static auto NAME_START {raw().find_last_of(": ") + 1};
+	constexpr static auto NAME_END {raw().find_first_of("];", NAME_START)};
+	constexpr static auto NAME_LEN {NAME_END - NAME_START};
+	constexpr static auto NAME_ARR {EnumValueDetails::template strArr<NAME_LEN>(raw(), NAME_START, NAME_END)};
 
 public:
-	constexpr static std::string_view valueName {nameArr.data(), nameArr.size()};
-	constexpr static auto valid {valueName.back() < '0' || valueName.back() > '9'};
-#pragma GCC diagnostic push
-#ifdef __clang__
-#	pragma GCC diagnostic ignored "-Wenum-constexpr-conversion"
-#endif
-	constexpr static auto raw_value {value};
-#pragma GCC diagnostic pop
+	constexpr static std::string_view VALUE_NAME {NAME_ARR.data(), NAME_ARR.size()};
+	constexpr static auto VALID {VALUE_NAME.back() < '0' || VALUE_NAME.back() > '9'};
+	constexpr static auto RAW_VALUE {Value};
 };
 
 /// EnumValueCollection
 // Customisation point for specifying the range of underlying values your enum can have
 template<typename E> struct EnumValueCollection {
-	using Vs = std::make_integer_sequence<int, 256>;
+	using Underlying = std::underlying_type_t<E>;
+	static constexpr Underlying UPPER = std::numeric_limits<Underlying>::max();
+	using Vs = std::make_integer_sequence<Underlying, UPPER>;
 };
 
 /// EnumDetails
@@ -84,45 +81,36 @@ template<typename E> struct EnumDetails {
 #ifndef ENUM_PROBE
 private:
 #endif
-	template<auto... n>
+	using Underlying = std::underlying_type_t<E>;
+
+	template<auto... N>
 	constexpr static auto
-	get_valids(std::integer_sequence<int, n...>)
+	getValids(std::integer_sequence<Underlying, N...>)
 	{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#ifdef __clang__
-#	pragma GCC diagnostic ignored "-Wenum-constexpr-conversion"
-#endif
-		return std::array {EnumValueDetails<static_cast<E>(n)>::valid...};
-#pragma GCC diagnostic pop
+		return std::array {EnumValueDetails<static_cast<E>(N)>::VALID...};
 	}
 
-	template<auto... n>
+	template<auto... N>
 	constexpr static auto
-	get_values(std::integer_sequence<int, n...>)
+	getValues(std::integer_sequence<Underlying, N...>)
 	{
-#pragma GCC diagnostic push
-#ifdef __clang__
-#	pragma GCC diagnostic ignored "-Wenum-constexpr-conversion"
-#endif
-		return std::array {EnumValueDetails<static_cast<E>(n)>::raw_value...};
-#pragma GCC diagnostic pop
+		return std::array {EnumValueDetails<static_cast<E>(N)>::RAW_VALUE...};
 	}
 
-	template<auto... n>
+	template<auto... N>
 	constexpr static auto
-	get_valueNames(std::integer_sequence<int, n...>)
+	getValueNames(std::integer_sequence<int, N...>)
 	{
-		return std::array {EnumValueDetails<values[n]>::valueName...};
+		return std::array {EnumValueDetails<VALUES[N]>::VALUE_NAME...};
 	}
 
 	using EVC = EnumValueCollection<E>;
-	constexpr static auto valid_flags {get_valids(typename EVC::Vs {})};
-	constexpr static auto valid_count {std::count_if(valid_flags.begin(), valid_flags.end(), std::identity {})};
+	constexpr static auto VALID_FLAGS {getValids(typename EVC::Vs {})};
+	constexpr static auto VALID_COUNT {std::count_if(VALID_FLAGS.begin(), VALID_FLAGS.end(), std::identity {})};
 
 	constexpr static auto
-	lookup(const auto key, const auto & search,
-			const auto & out) -> std::optional<typename std::decay_t<decltype(out)>::value_type>
+	lookup(const auto key, const auto & search, const auto & out)
+			-> std::optional<typename std::decay_t<decltype(out)>::value_type>
 	{
 		if (const auto itr = std::find(search.begin(), search.end(), key); itr != search.end()) {
 			return out[static_cast<std::size_t>(std::distance(search.begin(), itr))];
@@ -131,32 +119,32 @@ private:
 	}
 
 public:
-	constexpr static auto values {[]() {
-		constexpr auto values {get_values(typename EVC::Vs {})};
-		static_assert(std::is_sorted(values.begin(), values.end()), "Candidate values must be sorted");
-		std::array<E, valid_count> out;
-		std::copy_if(values.begin(), values.end(), out.begin(), [valid = valid_flags.begin()](auto) mutable {
+	constexpr static auto VALUES {[]() {
+		constexpr auto VALUES {getValues(typename EVC::Vs {})};
+		static_assert(std::ranges::is_sorted(VALUES), "Candidate values must be sorted");
+		std::array<E, VALID_COUNT> out;
+		std::copy_if(VALUES.begin(), VALUES.end(), out.begin(), [valid = VALID_FLAGS.begin()](auto) mutable {
 			return *valid++;
 		});
 		return out;
 	}()};
-	constexpr static auto names {get_valueNames(std::make_integer_sequence<int, valid_count> {})};
+	constexpr static auto NAMES {getValueNames(std::make_integer_sequence<int, VALID_COUNT> {})};
 
 	constexpr static bool
-	is_valid(E value) noexcept
+	isValid(E value) noexcept
 	{
-		return std::binary_search(values.begin(), values.end(), value);
+		return std::binary_search(VALUES.begin(), VALUES.end(), value);
 	}
 
 	constexpr static std::optional<E>
 	parse(std::string_view name) noexcept
 	{
-		return lookup(name, names, values);
+		return lookup(name, NAMES, VALUES);
 	}
 
 	constexpr static std::optional<std::string_view>
-	to_string(E value) noexcept
+	toString(E value) noexcept
 	{
-		return lookup(value, values, names);
+		return lookup(value, VALUES, NAMES);
 	}
 };