mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-20 03:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

StringUtil: Use concepts instead of enable_if.

Browse source
This commit is contained in:
Jordan Woyak 2025-04-03 17:46:31 -05:00
parent 61ab662733
commit 6ef7b41394
2 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Source/Core/Common/StringUtil.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <charconv>
#include <concepts>
#include <cstdarg>
#include <cstddef>
#include <cstdlib>
@ -18,22 +19,8 @@
#include <vector>
#include "Common/CommonTypes.h"
namespace detail
{
template <typename T>
constexpr bool IsBooleanEnum()
{
if constexpr (std::is_enum_v<T>)
{
return std::is_same_v<std::underlying_type_t<T>, bool>;
}
else
{
return false;
}
}
} // namespace detail
#include "Common/EnumUtils.h"
#include "Common/TypeUtils.h"
std::string StringFromFormatV(const char* format, va_list args);
@ -74,8 +61,8 @@ bool TryParse(const std::string& str, bool* output);
template <typename T>
requires(std::is_integral_v<T> ||
(std::is_enum_v<T> && !detail::IsBooleanEnum<T>())) bool TryParse(const std::string& str,
T* output, int base = 0)
(std::is_enum_v<T> && !Common::BooleanEnum<T>)) bool TryParse(const std::string& str,
T* output, int base = 0)
{
char* end_ptr = nullptr;
@ -112,8 +99,8 @@ requires(std::is_integral_v<T> ||
return true;
}
template <typename T>
requires(detail::IsBooleanEnum<T>()) bool TryParse(const std::string& str, T* output)
template <Common::BooleanEnum T>
bool TryParse(const std::string& str, T* output)
{
bool value;
if (!TryParse(str, &value))
@ -123,7 +110,7 @@ requires(detail::IsBooleanEnum<T>()) bool TryParse(const std::string& str, T* ou
return true;
}
template <typename T, std::enable_if_t<std::is_floating_point_v<T>>* = nullptr>
template <std::floating_point T>
bool TryParse(std::string str, T* const output)
{
// Replace commas with dots.
@ -169,10 +156,9 @@ std::string ValueToString(double value);
std::string ValueToString(int value);
std::string ValueToString(s64 value);
std::string ValueToString(bool value);
template <typename T, std::enable_if_t<std::is_enum<T>::value>* = nullptr>
std::string ValueToString(T value)
std::string ValueToString(Common::Enum auto value)
{
return ValueToString(static_cast<std::underlying_type_t<T>>(value));
return ValueToString(Common::ToUnderlying(value));
}
// Generates an hexdump-like representation of a binary data blob.
@ -180,15 +166,13 @@ std::string HexDump(const u8* data, size_t size);
namespace Common
{
template <typename T, typename std::enable_if_t<std::is_integral_v<T>>* = nullptr>
std::from_chars_result FromChars(std::string_view sv, T& value, int base = 10)
std::from_chars_result FromChars(std::string_view sv, std::integral auto& value, int base = 10)
{
const char* const first = sv.data();
const char* const last = first + sv.size();
return std::from_chars(first, last, value, base);
}
template <typename T, typename std::enable_if_t<std::is_floating_point_v<T>>* = nullptr>
std::from_chars_result FromChars(std::string_view sv, T& value,
std::from_chars_result FromChars(std::string_view sv, std::floating_point auto& value,
std::chars_format fmt = std::chars_format::general)
{
const char* const first = sv.data();

9
Source/Core/Common/TypeUtils.h
View file

@ -82,4 +82,13 @@ static_assert(!IsNOf<int, 1, int, int>::value);
static_assert(IsNOf<int, 2, int, int>::value);
static_assert(IsNOf<int, 2, int, short>::value); // Type conversions ARE allowed
static_assert(!IsNOf<int, 2, int, char*>::value);
template <typename T>
concept Enum = std::is_enum_v<T>;
template <typename T, typename Underlying>
concept TypedEnum = std::is_same_v<std::underlying_type_t<T>, Underlying>;
template <typename T>
concept BooleanEnum = TypedEnum<T, bool>;
} // namespace Common