aboutsummaryrefslogtreecommitdiffstats
path: root/libdevcore
diff options
context:
space:
mode:
authorEvgeniy Filatov <efilatov@geeksforless.net>2018-08-02 22:57:16 +0800
committerEvgeniy Filatov <efilatov@geeksforless.net>2018-08-03 19:07:03 +0800
commit3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a (patch)
tree29ab864be99ead58a263cbd67d8ecc4f1a585472 /libdevcore
parent009a55c82d22f08fd207739d7b8aeff215fb7c03 (diff)
downloaddexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar.gz
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar.bz2
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar.lz
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar.xz
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.tar.zst
dexon-solidity-3705bcc9bc8c726a60c1eaa1d29cd1d240c0268a.zip
added helper function that joins vectors of strings, refactored suggestions formattingi function to use it
Diffstat (limited to 'libdevcore')
-rw-r--r--libdevcore/StringUtils.cpp14
-rw-r--r--libdevcore/StringUtils.h39
2 files changed, 43 insertions, 10 deletions
diff --git a/libdevcore/StringUtils.cpp b/libdevcore/StringUtils.cpp
index 2ff86bd5..01bdc675 100644
--- a/libdevcore/StringUtils.cpp
+++ b/libdevcore/StringUtils.cpp
@@ -85,17 +85,11 @@ size_t dev::stringDistance(string const& _str1, string const& _str2)
string dev::quotedAlternativesList(vector<string> const& suggestions)
{
- if (suggestions.empty())
- return "";
- if (suggestions.size() == 1)
- return "\"" + suggestions.front() + "\"";
+ vector<string> quotedSuggestions;
- string choices = "\"" + suggestions.front() + "\"";
- for (size_t i = 1; i + 1 < suggestions.size(); ++i)
- choices += ", \"" + suggestions[i] + "\"";
+ for (auto& suggestion: suggestions)
+ quotedSuggestions.push_back("\"" + suggestion + "\"");
- choices += " or \"" + suggestions.back() + "\"";
-
- return choices;
+ return joinHumanReadable(quotedSuggestions, ", ", " or ");
}
diff --git a/libdevcore/StringUtils.h b/libdevcore/StringUtils.h
index acd93e32..4fb5a748 100644
--- a/libdevcore/StringUtils.h
+++ b/libdevcore/StringUtils.h
@@ -36,4 +36,43 @@ size_t stringDistance(std::string const& _str1, std::string const& _str2);
// Return a string having elements of suggestions as quoted, alternative suggestions. e.g. "a", "b" or "c"
std::string quotedAlternativesList(std::vector<std::string> const& suggestions);
+/// Joins collection of strings into one string with separators between, last separator can be different.
+/// @param _list collection of strings to join
+/// @param _separator defaults to ", "
+/// @param _lastSeparator (optional) will be used to separate last two strings instead of _separator
+/// @example join(vector<string>{"a", "b", "c"}, "; ", " or ") == "a; b or c"
+template<class T>
+std::string joinHumanReadable
+(
+ T const& _list,
+ std::string const& _separator = ", ",
+ std::string const& _lastSeparator = ""
+)
+{
+ auto it = begin(_list);
+ auto itEnd = end(_list);
+
+ std::string result;
+
+ // append first string
+ if (it != itEnd)
+ {
+ result += *it;
+ ++it;
+ }
+
+ for (;it != itEnd; ++it)
+ {
+ if ((next(it) == itEnd) && !_lastSeparator.empty())
+ result += _lastSeparator; // last iteration
+ else
+ result += _separator;
+
+ // append string
+ result += *it;
+ }
+
+ return result;
+}
+
}