organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[base] remove unused Format functional

Browse source 
Signed-off-by: Evgeniy A. Dushistov <dushistov@mail.ru>
This commit is contained in:
Evgeniy A. Dushistov 2021-05-02 19:59:32 +03:00 • committed by Viktor Govako
parent dfe08e03fc
commit c3719e63c0
7 changed files with 1 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/CMakeLists.txt
View file

@ -70,8 +70,6 @@ set(
stats.hpp
stl_helpers.hpp
stl_iterator.hpp
string_format.cpp
string_format.hpp
string_utils.cpp
string_utils.hpp
strings_bundle.cpp

1
base/base_tests/CMakeLists.txt
View file

@ -39,7 +39,6 @@ set(
scope_guard_test.cpp
small_set_test.cpp
stl_helpers_tests.cpp
string_format_test.cpp
string_utils_test.cpp
suffix_array_tests.cpp
sunrise_sunset_test.cpp

11
base/base_tests/string_format_test.cpp
View file

@ -1,11 +0,0 @@
#include "testing/testing.hpp"
#include "base/string_format.hpp"
UNIT_TEST(StringFormat_Smoke)
{
TEST_EQUAL(strings::Format("this is ^ ^ ^ ^", "a", "very", "simple", "test"), "this is a very simple test", ());
TEST_EQUAL(strings::Format("this", "a"), "this", ());
TEST_EQUAL(strings::Format("this ^ ^", "is"), "this is ^", ());
}

47
base/string_format.cpp
View file

@ -1,47 +0,0 @@
#include "base/string_format.hpp"
#include <list>
namespace strings
{
std::string const FormatImpl(std::string const & s, std::string arr[], size_t count)
{
size_t offs = 0;
std::list<size_t> fieldOffs;
std::string res = s;
while (true)
{
offs = res.find("^", offs);
if (offs == std::string::npos)
break;
else
{
if ((offs != 0) && (res[offs - 1] == '\\'))
{
res = res.erase(offs - 1, 1);
--offs;
}
else
fieldOffs.push_back(offs);
++offs;
}
}
offs = 0;
size_t i = 0;
for (std::list<size_t>::const_iterator offsIt = fieldOffs.begin();
(offsIt != fieldOffs.end()) && (i < count);
++offsIt, ++i)
{
res.replace(*offsIt + offs, 1, arr[i]);
offs += (arr[i].size() - 1);
}
return res;
}
}

56
base/string_format.hpp
View file

@ -1,56 +0,0 @@
#pragma once
#include "base/base.hpp"
#include "base/macros.hpp"
#include <sstream>
#include <string>
namespace strings
{
template <typename T>
std::string ToString(T const & t)
{
// May be we should use DebugPrint here. Not sure.
std::ostringstream out;
out << t;
return out.str();
}
std::string const FormatImpl(std::string const & s, std::string arr[], size_t count);
template <typename T1>
std::string const Format(std::string const & s, T1 const & t1)
{
std::string arr[] = { ToString(t1) };
return FormatImpl(s, arr, ARRAY_SIZE(arr));
}
template <typename T1, typename T2>
std::string const Format(std::string const & s, T1 const & t1, T2 const & t2)
{
std::string arr[] = { ToString(t1), ToString(t2) };
return FormatImpl(s, arr, ARRAY_SIZE(arr));
}
template <typename T1, typename T2, typename T3>
std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3)
{
std::string arr[] = { ToString(t1), ToString(t2), ToString(t3) };
return FormatImpl(s, arr, ARRAY_SIZE(arr));
}
template <typename T1, typename T2, typename T3, typename T4>
std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4)
{
std::string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4) };
return FormatImpl(s, arr, ARRAY_SIZE(arr));
}
template <typename T1, typename T2, typename T3, typename T4, typename T5>
std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4, T5 const & t5)
{
std::string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4), ToString(t5) };
return FormatImpl(s, arr, ARRAY_SIZE(arr));
}
}

3
map/map_tests/mwm_url_tests.cpp
View file

@ -13,7 +13,6 @@
#include "base/macros.hpp"
#include "base/scope_guard.hpp"
#include "base/string_format.hpp"
#include <random>
#include <sstream>
@ -376,7 +375,7 @@ namespace
string generatePartOfUrl(url_scheme::ApiPoint const & point)
{
stringstream stream;
stream << "&ll=" << strings::ToString(point.m_lat) << "," << strings::ToString(point.m_lon)
stream << "&ll=" << std::to_string(point.m_lat) << "," << std::to_string(point.m_lon)
<< "&n=" << point.m_name
<< "&id=" << point.m_id;
return stream.str();

12
xcode/base/base.xcodeproj/project.pbxproj
View file

@ -64,7 +64,6 @@
39FD272D1CC65AD000AFF551 /* regexp_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26D71CC65A0E00AFF551 /* regexp_test.cpp */; };
39FD272E1CC65AD000AFF551 /* rolling_hash_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26D81CC65A0E00AFF551 /* rolling_hash_test.cpp */; };
39FD272F1CC65AD000AFF551 /* scope_guard_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26D91CC65A0E00AFF551 /* scope_guard_test.cpp */; };
39FD27321CC65AD000AFF551 /* string_format_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26DC1CC65A0E00AFF551 /* string_format_test.cpp */; };
39FD27331CC65AD000AFF551 /* string_utils_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26DD1CC65A0E00AFF551 /* string_utils_test.cpp */; };
39FD27341CC65AD000AFF551 /* sunrise_sunset_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26DE1CC65A0E00AFF551 /* sunrise_sunset_test.cpp */; };
39FD27351CC65AD000AFF551 /* thread_pool_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26DF1CC65A0E00AFF551 /* thread_pool_tests.cpp */; };
@ -133,8 +132,6 @@
675341FB1A3F57E400A0A8C3 /* stats.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341B61A3F57E400A0A8C3 /* stats.hpp */; };
675341FC1A3F57E400A0A8C3 /* std_serialization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341B71A3F57E400A0A8C3 /* std_serialization.hpp */; };
675341FE1A3F57E400A0A8C3 /* stl_iterator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341B91A3F57E400A0A8C3 /* stl_iterator.hpp */; };
675341FF1A3F57E400A0A8C3 /* string_format.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341BA1A3F57E400A0A8C3 /* string_format.cpp */; };
675342001A3F57E400A0A8C3 /* string_format.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341BB1A3F57E400A0A8C3 /* string_format.hpp */; };
675342011A3F57E400A0A8C3 /* string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341BC1A3F57E400A0A8C3 /* string_utils.cpp */; };
675342021A3F57E400A0A8C3 /* string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341BD1A3F57E400A0A8C3 /* string_utils.hpp */; };
675342031A3F57E400A0A8C3 /* strings_bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */; };
@ -214,7 +211,6 @@
39FD26D71CC65A0E00AFF551 /* regexp_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexp_test.cpp; sourceTree = "<group>"; };
39FD26D81CC65A0E00AFF551 /* rolling_hash_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rolling_hash_test.cpp; sourceTree = "<group>"; };
39FD26D91CC65A0E00AFF551 /* scope_guard_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope_guard_test.cpp; sourceTree = "<group>"; };
39FD26DC1CC65A0E00AFF551 /* string_format_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_format_test.cpp; sourceTree = "<group>"; };
39FD26DD1CC65A0E00AFF551 /* string_utils_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_utils_test.cpp; sourceTree = "<group>"; };
39FD26DE1CC65A0E00AFF551 /* sunrise_sunset_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sunrise_sunset_test.cpp; sourceTree = "<group>"; };
39FD26DF1CC65A0E00AFF551 /* thread_pool_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_pool_tests.cpp; sourceTree = "<group>"; };
@ -290,8 +286,6 @@
675341B61A3F57E400A0A8C3 /* stats.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats.hpp; sourceTree = "<group>"; };
675341B71A3F57E400A0A8C3 /* std_serialization.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = std_serialization.hpp; sourceTree = "<group>"; };
675341B91A3F57E400A0A8C3 /* stl_iterator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stl_iterator.hpp; sourceTree = "<group>"; };
675341BA1A3F57E400A0A8C3 /* string_format.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_format.cpp; sourceTree = "<group>"; };
675341BB1A3F57E400A0A8C3 /* string_format.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_format.hpp; sourceTree = "<group>"; };
675341BC1A3F57E400A0A8C3 /* string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_utils.cpp; sourceTree = "<group>"; };
675341BD1A3F57E400A0A8C3 /* string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_utils.hpp; sourceTree = "<group>"; };
675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strings_bundle.cpp; sourceTree = "<group>"; };
@ -385,7 +379,6 @@
39FD26D71CC65A0E00AFF551 /* regexp_test.cpp */,
39FD26D81CC65A0E00AFF551 /* rolling_hash_test.cpp */,
39FD26D91CC65A0E00AFF551 /* scope_guard_test.cpp */,
39FD26DC1CC65A0E00AFF551 /* string_format_test.cpp */,
39FD26DD1CC65A0E00AFF551 /* string_utils_test.cpp */,
39FD26DE1CC65A0E00AFF551 /* sunrise_sunset_test.cpp */,
39FD26DF1CC65A0E00AFF551 /* thread_pool_tests.cpp */,
@ -496,8 +489,6 @@
675341B71A3F57E400A0A8C3 /* std_serialization.hpp */,
672DD4BA1E0425600078E13C /* stl_helpers.hpp */,
675341B91A3F57E400A0A8C3 /* stl_iterator.hpp */,
675341BA1A3F57E400A0A8C3 /* string_format.cpp */,
675341BB1A3F57E400A0A8C3 /* string_format.hpp */,
675341BC1A3F57E400A0A8C3 /* string_utils.cpp */,
675341BD1A3F57E400A0A8C3 /* string_utils.hpp */,
675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */,
@ -578,7 +569,6 @@
3D1BE646212D775500ACD94A /* atomic_shared_ptr.hpp in Headers */,
672DD4C81E0425600078E13C /* stl_helpers.hpp in Headers */,
675341CE1A3F57E400A0A8C3 /* base.hpp in Headers */,
675342001A3F57E400A0A8C3 /* string_format.hpp in Headers */,
675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */,
672DD4BF1E0425600078E13C /* collection_cast.hpp in Headers */,
3917FA5F211E00C400937DF4 /* suffix_array.hpp in Headers */,
@ -728,7 +718,6 @@
3917FA65211E010400937DF4 /* visitor_tests.cpp in Sources */,
39F1E53121C961B800D961DC /* beam_tests.cpp in Sources */,
3917FA6A211E010400937DF4 /* control_flow_tests.cpp in Sources */,
39FD27321CC65AD000AFF551 /* string_format_test.cpp in Sources */,
39FD272A1CC65AD000AFF551 /* mem_trie_test.cpp in Sources */,
395FEB3521492F350036395C /* stl_helpers_tests.cpp in Sources */,
3975D20C235F2761004D84D3 /* thread_safe_queue_tests.cpp in Sources */,
@ -794,7 +783,6 @@
3DBD7B95240FB11200ED9FE8 /* checked_cast_tests.cpp in Sources */,
6753420A1A3F57E400A0A8C3 /* threaded_container.cpp in Sources */,
3917FA5C211E00BB00937DF4 /* pprof.cpp in Sources */,
675341FF1A3F57E400A0A8C3 /* string_format.cpp in Sources */,
67A609AE1C88642E001E641A /* deferred_task.cpp in Sources */,
675341DF1A3F57E400A0A8C3 /* logging.cpp in Sources */,
671182F01C807C0A00CB8177 /* gmtime.cpp in Sources */,