archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fmt::replace_all with empty from and add unit tests

Browse source
This commit is contained in:
Megamouse 2025-04-30 23:18:46 +02:00
parent 259768e896
commit 486e93f418
3 changed files with 223 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utilities/StrFmt.cpp
View file

@ -748,6 +748,12 @@ void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup
std::string fmt::replace_all(std::string_view src, std::string_view from, std::string_view to, usz count)
{
if (src.empty())
return {};
if (from.empty() || count == 0)
return std::string(src);
std::string target;
target.reserve(src.size() + to.size());

23
Utilities/StrUtil.h
View file

@ -39,11 +39,15 @@ std::string get_file_extension(const std::string& file_path);
namespace fmt
{
std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);
// Replaces all occurrences of 'from' with 'to' until 'count' substrings were replaced.
std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = umax);
template <usz list_size>
std::string replace_all(std::string src, const std::pair<std::string_view, std::string> (&list)[list_size])
{
if constexpr (list_size == 0)
return src;
for (usz pos = 0; pos < src.length(); ++pos)
{
for (usz i = 0; i < list_size; ++i)
@ -71,6 +75,9 @@ namespace fmt
template <usz list_size>
std::string replace_all(std::string src, const std::pair<std::string_view, std::function<std::string()>> (&list)[list_size])
{
if constexpr (list_size == 0)
return src;
for (usz pos = 0; pos < src.length(); ++pos)
{
for (usz i = 0; i < list_size; ++i)
@ -99,6 +106,9 @@ namespace fmt
static inline
std::string replace_all(std::string src, const std::vector<std::pair<std::string, std::string>>& list)
{
if (list.empty())
return src;
for (usz pos = 0; pos < src.length(); ++pos)
{
for (usz i = 0; i < list.size(); ++i)
@ -123,9 +133,16 @@ namespace fmt
return src;
}
// Splits the string into a vector of strings using the separators. The vector may contain empty strings unless is_skip_empty is true.
std::vector<std::string> split(std::string_view source, std::initializer_list<std::string_view> separators, bool is_skip_empty = true);
// Removes all preceding and trailing characters specified by 'values' from 'source'.
std::string trim(const std::string& source, std::string_view values = " \t");
// Removes all preceding characters specified by 'values' from 'source'.
std::string trim_front(const std::string& source, std::string_view values = " \t");
// Removes all trailing characters specified by 'values' from 'source'.
void trim_back(std::string& source, std::string_view values = " \t");
template <typename T>
@ -175,9 +192,13 @@ namespace fmt
return result;
}
// Returns the string transformed to uppercase
std::string to_upper(std::string_view string);
// Returns the string transformed to lowercase
std::string to_lower(std::string_view string);
// Returns the string shortened to length
std::string truncate(std::string_view src, usz length);
bool match(const std::string& source, const std::string& mask);