coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed string utility etl::transform to etl::replace

Browse Source
This commit is contained in:
John Wellbelove 2020-07-17 13:48:01 +01:00
parent 0a1b49c8f8
commit 26c595edc8
9 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/etl/private/string_utilities_helper.h
View File

@ -273,12 +273,12 @@ namespace etl
}
//***************************************************************************
/// transform_characters
/// replace_characters
//***************************************************************************
template <typename TIString>
void transform_characters(TIString& s,
const etl::pair<typename TIString::value_type, typename TIString::value_type>* pairsbegin,
const etl::pair<typename TIString::value_type, typename TIString::value_type>* pairsend)
void replace_characters(TIString& s,
const etl::pair<typename TIString::value_type, typename TIString::value_type>* pairsbegin,
const etl::pair<typename TIString::value_type, typename TIString::value_type>* pairsend)
{
while (pairsbegin != pairsend)
{
@ -288,12 +288,12 @@ namespace etl
}
//***************************************************************************
/// transform_strings
/// replace_strings
//***************************************************************************
template <typename TIString>
void transform_strings(TIString& s,
const etl::pair<const typename TIString::value_type*, const typename TIString::value_type*>* pairsbegin,
const etl::pair<const typename TIString::value_type*, const typename TIString::value_type*>* pairsend)
void replace_strings(TIString& s,
const etl::pair<const typename TIString::value_type*, const typename TIString::value_type*>* pairsbegin,
const etl::pair<const typename TIString::value_type*, const typename TIString::value_type*>* pairsend)
{
while (pairsbegin != pairsend)
{

20
include/etl/string_utilities.h
View File

@ -317,23 +317,23 @@ namespace etl
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::istring& s,
const etl::pair<etl::istring::value_type, etl::istring::value_type>* pairsbegin,
const etl::pair<etl::istring::value_type, etl::istring::value_type>* pairsend)
inline void replace(etl::istring& s,
const etl::pair<etl::istring::value_type, etl::istring::value_type>* pairsbegin,
const etl::pair<etl::istring::value_type, etl::istring::value_type>* pairsend)
{
etl::private_string_utilities::transform_characters<etl::istring>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_characters<etl::istring>(s, pairsbegin, pairsend);
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::istring& s,
const etl::pair<const etl::istring::value_type*, const etl::istring::value_type*>* pairsbegin,
const etl::pair<const etl::istring::value_type*, const etl::istring::value_type*>* pairsend)
inline void replace(etl::istring& s,
const etl::pair<const etl::istring::value_type*, const etl::istring::value_type*>* pairsbegin,
const etl::pair<const etl::istring::value_type*, const etl::istring::value_type*>* pairsend)
{
etl::private_string_utilities::transform_strings<etl::istring>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_strings<etl::istring>(s, pairsbegin, pairsend);
}
//***************************************************************************

20
include/etl/u16string_utilities.h
View File

@ -273,23 +273,23 @@ namespace etl
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iu16string& s,
const etl::pair<etl::iu16string::value_type, etl::iu16string::value_type>* pairsbegin,
const etl::pair<etl::iu16string::value_type, etl::iu16string::value_type>* pairsend)
inline void replace(etl::iu16string& s,
const etl::pair<etl::iu16string::value_type, etl::iu16string::value_type>* pairsbegin,
const etl::pair<etl::iu16string::value_type, etl::iu16string::value_type>* pairsend)
{
etl::private_string_utilities::transform_characters<etl::iu16string>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_characters<etl::iu16string>(s, pairsbegin, pairsend);
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iu16string& s,
const etl::pair<const etl::iu16string::value_type*, const etl::iu16string::value_type*>* pairsbegin,
const etl::pair<const etl::iu16string::value_type*, const etl::iu16string::value_type*>* pairsend)
inline void replace(etl::iu16string& s,
const etl::pair<const etl::iu16string::value_type*, const etl::iu16string::value_type*>* pairsbegin,
const etl::pair<const etl::iu16string::value_type*, const etl::iu16string::value_type*>* pairsend)
{
etl::private_string_utilities::transform_strings<etl::iu16string>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_strings<etl::iu16string>(s, pairsbegin, pairsend);
}
//***************************************************************************

20
include/etl/u32string_utilities.h
View File

@ -273,23 +273,23 @@ namespace etl
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iu32string& s,
const etl::pair<etl::iu32string::value_type, etl::iu32string::value_type>* pairsbegin,
const etl::pair<etl::iu32string::value_type, etl::iu32string::value_type>* pairsend)
inline void replace(etl::iu32string& s,
const etl::pair<etl::iu32string::value_type, etl::iu32string::value_type>* pairsbegin,
const etl::pair<etl::iu32string::value_type, etl::iu32string::value_type>* pairsend)
{
etl::private_string_utilities::transform_characters<etl::iu32string>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_characters<etl::iu32string>(s, pairsbegin, pairsend);
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iu32string& s,
const etl::pair<const etl::iu32string::value_type*, const etl::iu32string::value_type*>* pairsbegin,
const etl::pair<const etl::iu32string::value_type*, const etl::iu32string::value_type*>* pairsend)
inline void replace(etl::iu32string& s,
const etl::pair<const etl::iu32string::value_type*, const etl::iu32string::value_type*>* pairsbegin,
const etl::pair<const etl::iu32string::value_type*, const etl::iu32string::value_type*>* pairsend)
{
etl::private_string_utilities::transform_strings<etl::iu32string>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_strings<etl::iu32string>(s, pairsbegin, pairsend);
}
//***************************************************************************

20
include/etl/wstring_utilities.h
View File

@ -273,23 +273,23 @@ namespace etl
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iwstring& s,
const etl::pair<etl::iwstring::value_type, etl::iwstring::value_type>* pairsbegin,
const etl::pair<etl::iwstring::value_type, etl::iwstring::value_type>* pairsend)
inline void replace(etl::iwstring& s,
const etl::pair<etl::iwstring::value_type, etl::iwstring::value_type>* pairsbegin,
const etl::pair<etl::iwstring::value_type, etl::iwstring::value_type>* pairsend)
{
etl::private_string_utilities::transform_characters<etl::iwstring>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_characters<etl::iwstring>(s, pairsbegin, pairsend);
}
//***************************************************************************
/// transform
/// replace
//***************************************************************************
inline void transform(etl::iwstring& s,
const etl::pair<const etl::iwstring::value_type*, const etl::iwstring::value_type*>* pairsbegin,
const etl::pair<const etl::iwstring::value_type*, const etl::iwstring::value_type*>* pairsend)
inline void replace(etl::iwstring& s,
const etl::pair<const etl::iwstring::value_type*, const etl::iwstring::value_type*>* pairsbegin,
const etl::pair<const etl::iwstring::value_type*, const etl::iwstring::value_type*>* pairsend)
{
etl::private_string_utilities::transform_strings<etl::iwstring>(s, pairsbegin, pairsend);
etl::private_string_utilities::replace_strings<etl::iwstring>(s, pairsbegin, pairsend);
}
//***************************************************************************

16
test/test_string_utilities.cpp
View File

@ -785,7 +785,7 @@ namespace
}
//*************************************************************************
TEST(test_transform_characters)
TEST(test_replace_characters)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("This---is_a__-file__name_"));
@ -799,13 +799,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_characters_empty_string)
TEST(test_replace_characters_empty_string)
{
String text(STR(""));
String expected(STR(""));
@ -819,13 +819,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings)
TEST(test_replace_strings)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("Thisxyis%20a%20%20-file_name.txt"));
@ -839,13 +839,13 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings_empty_strings)
TEST(test_replace_strings_empty_strings)
{
String text(STR(""));
String expected(STR(""));
@ -859,7 +859,7 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}

16
test/test_string_utilities_u16.cpp
View File

@ -785,7 +785,7 @@ namespace
}
//*************************************************************************
TEST(test_transform_characters)
TEST(test_replace_characters)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("This---is_a__-file__name_"));
@ -799,13 +799,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_characters_empty_string)
TEST(test_replace_characters_empty_string)
{
String text(STR(""));
String expected(STR(""));
@ -819,13 +819,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings)
TEST(test_replace_strings)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("Thisxyis%20a%20%20-file_name.txt"));
@ -839,13 +839,13 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings_empty_strings)
TEST(test_replace_strings_empty_strings)
{
String text(STR(""));
String expected(STR(""));
@ -859,7 +859,7 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}

16
test/test_string_utilities_u32.cpp
View File

@ -785,7 +785,7 @@ namespace
}
//*************************************************************************
TEST(test_transform_characters)
TEST(test_replace_characters)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("This---is_a__-file__name_"));
@ -799,13 +799,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_characters_empty_string)
TEST(test_replace_characters_empty_string)
{
String text(STR(""));
String expected(STR(""));
@ -819,13 +819,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings)
TEST(test_replace_strings)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("Thisxyis%20a%20%20-file_name.txt"));
@ -839,13 +839,13 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings_empty_strings)
TEST(test_replace_strings_empty_strings)
{
String text(STR(""));
String expected(STR(""));
@ -859,7 +859,7 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}

16
test/test_string_utilities_wchar_t.cpp
View File

@ -785,7 +785,7 @@ namespace
}
//*************************************************************************
TEST(test_transform_characters)
TEST(test_replace_characters)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("This---is_a__-file__name_"));
@ -799,13 +799,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_characters_empty_string)
TEST(test_replace_characters_empty_string)
{
String text(STR(""));
String expected(STR(""));
@ -819,13 +819,13 @@ namespace
{ STR(':'), STR('_') }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings)
TEST(test_replace_strings)
{
String text(STR("This+++is a *file//name:"));
String expected(STR("Thisxyis%20a%20%20-file_name.txt"));
@ -839,13 +839,13 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}
//*************************************************************************
TEST(test_transform_strings_empty_strings)
TEST(test_replace_strings_empty_strings)
{
String text(STR(""));
String expected(STR(""));
@ -859,7 +859,7 @@ namespace
{ STR(":"), STR(".txt") }
};
etl::transform(text, etl::begin(lookup), etl::end(lookup));
etl::replace(text, etl::begin(lookup), etl::end(lookup));
CHECK(expected == text);
}