summaryrefslogtreecommitdiffstats
path: root/core/strtools.cc
diff options
context:
space:
mode:
Diffstat (limited to 'core/strtools.cc')
-rw-r--r--core/strtools.cc31
1 files changed, 19 insertions, 12 deletions
diff --git a/core/strtools.cc b/core/strtools.cc
index ebb8f73..4edd86b 100644
--- a/core/strtools.cc
+++ b/core/strtools.cc
@@ -1,26 +1,29 @@
#include "core/pch.hh"
+
#include "core/strtools.hh"
-constexpr static const char *WHITESPACE_CHARS = " \t\r\n";
+constexpr static const char* WHITESPACE_CHARS = " \t\r\n";
-bool strtools::is_whitespace(const std::string &string)
+bool strtools::is_whitespace(const std::string& string)
{
- if(string.find_first_not_of(WHITESPACE_CHARS) == std::string::npos)
+ if(string.find_first_not_of(WHITESPACE_CHARS) == std::string::npos) {
return true;
- if((string.size() == 1) && string[0] == 0x00)
+ } else if((string.size() == 1) && string[0] == 0x00) {
return true;
- return string.empty();
+ } else {
+ return string.empty();
+ }
}
-std::string strtools::join(const std::vector<std::string> &strings, const std::string &separator)
+std::string strtools::join(const std::vector<std::string>& strings, const std::string& separator)
{
std::ostringstream stream;
- for(const std::string &str : strings)
+ for(const std::string& str : strings)
stream << str << separator;
return stream.str();
}
-std::vector<std::string> strtools::split(const std::string &string, const std::string &separator)
+std::vector<std::string> strtools::split(const std::string& string, const std::string& separator)
{
std::size_t pos = 0;
std::size_t prev = 0;
@@ -31,17 +34,21 @@ std::vector<std::string> strtools::split(const std::string &string, const std::s
prev = pos + separator.length();
}
- if(prev <= string.length())
+ if(prev <= string.length()) {
result.push_back(string.substr(prev, string.length() - prev));
+ }
+
return result;
}
-std::string strtools::trim_whitespace(const std::string &string)
+std::string strtools::trim_whitespace(const std::string& string)
{
auto su = string.find_first_not_of(WHITESPACE_CHARS);
auto sv = string.find_last_not_of(WHITESPACE_CHARS);
- if(su == std::string::npos)
+ if(su == std::string::npos) {
return std::string();
- return string.substr(su, sv - su + 1);
+ } else {
+ return string.substr(su, sv - su + 1);
+ }
}