mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
util: Add Join helper to join a list of strings
This commit is contained in:
parent
e00ecb3d7a
commit
fa8cd6f9c1
4 changed files with 60 additions and 4 deletions
|
|
@ -211,6 +211,7 @@ BITCOIN_CORE_H = \
|
||||||
util/memory.h \
|
util/memory.h \
|
||||||
util/moneystr.h \
|
util/moneystr.h \
|
||||||
util/rbf.h \
|
util/rbf.h \
|
||||||
|
util/string.h \
|
||||||
util/threadnames.h \
|
util/threadnames.h \
|
||||||
util/time.h \
|
util/time.h \
|
||||||
util/translation.h \
|
util/translation.h \
|
||||||
|
|
@ -501,6 +502,7 @@ libbitcoin_util_a_SOURCES = \
|
||||||
util/rbf.cpp \
|
util/rbf.cpp \
|
||||||
util/threadnames.cpp \
|
util/threadnames.cpp \
|
||||||
util/strencodings.cpp \
|
util/strencodings.cpp \
|
||||||
|
util/string.cpp \
|
||||||
util/time.cpp \
|
util/time.cpp \
|
||||||
util/url.cpp \
|
util/url.cpp \
|
||||||
util/validation.cpp \
|
util/validation.cpp \
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,12 @@
|
||||||
|
|
||||||
#include <clientversion.h>
|
#include <clientversion.h>
|
||||||
#include <sync.h>
|
#include <sync.h>
|
||||||
#include <test/util.h>
|
|
||||||
#include <util/strencodings.h>
|
|
||||||
#include <util/moneystr.h>
|
|
||||||
#include <util/time.h>
|
|
||||||
#include <test/setup_common.h>
|
#include <test/setup_common.h>
|
||||||
|
#include <test/util.h>
|
||||||
|
#include <util/moneystr.h>
|
||||||
|
#include <util/strencodings.h>
|
||||||
|
#include <util/string.h>
|
||||||
|
#include <util/time.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
@ -123,6 +124,19 @@ BOOST_AUTO_TEST_CASE(util_HexStr)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOST_AUTO_TEST_CASE(util_Join)
|
||||||
|
{
|
||||||
|
// Normal version
|
||||||
|
BOOST_CHECK_EQUAL(Join({}, ", "), "");
|
||||||
|
BOOST_CHECK_EQUAL(Join({"foo"}, ", "), "foo");
|
||||||
|
BOOST_CHECK_EQUAL(Join({"foo", "bar"}, ", "), "foo, bar");
|
||||||
|
|
||||||
|
// Version with unary operator
|
||||||
|
const auto op_upper = [](const std::string& s) { return ToUpper(s); };
|
||||||
|
BOOST_CHECK_EQUAL(Join<std::string>({}, ", ", op_upper), "");
|
||||||
|
BOOST_CHECK_EQUAL(Join<std::string>({"foo"}, ", ", op_upper), "FOO");
|
||||||
|
BOOST_CHECK_EQUAL(Join<std::string>({"foo", "bar"}, ", ", op_upper), "FOO, BAR");
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTime)
|
BOOST_AUTO_TEST_CASE(util_FormatISO8601DateTime)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
5
src/util/string.cpp
Normal file
5
src/util/string.cpp
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
// Copyright (c) 2019 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#include <util/string.h>
|
||||||
35
src/util/string.h
Normal file
35
src/util/string.h
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright (c) 2019 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#ifndef BITCOIN_UTIL_STRING_H
|
||||||
|
#define BITCOIN_UTIL_STRING_H
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Join a list of items
|
||||||
|
*
|
||||||
|
* @param list The list to join
|
||||||
|
* @param separator The separator
|
||||||
|
* @param unary_op Apply this operator to each item in the list
|
||||||
|
*/
|
||||||
|
template <typename T, typename UnaryOp>
|
||||||
|
std::string Join(const std::vector<T>& list, const std::string& separator, UnaryOp unary_op)
|
||||||
|
{
|
||||||
|
std::string ret;
|
||||||
|
for (size_t i = 0; i < list.size(); ++i) {
|
||||||
|
if (i > 0) ret += separator;
|
||||||
|
ret += unary_op(list.at(i));
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline std::string Join(const std::vector<std::string>& list, const std::string& separator)
|
||||||
|
{
|
||||||
|
return Join(list, separator, [](const std::string& i) { return i; });
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // BITCOIN_UTIL_STRENCODINGS_H
|
||||||
Loading…
Add table
Add a link
Reference in a new issue