diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 13:36:22 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 13:36:22 +0000 |
commit | 7594f6d81259f9a299e50c4174af080bb5e0b288 (patch) | |
tree | 8f4a3e06e80b59421f7a566effc8a5fb1f95960e /base/string_split.cc | |
parent | 769c462e0ffbbbc2f210a76874d041dbcff921fc (diff) | |
download | chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.zip chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.gz chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.bz2 |
base: Move SplitStringDontTrim functions from string_util.h to string_split.h
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3366011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_split.cc')
-rw-r--r-- | base/string_split.cc | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/base/string_split.cc b/base/string_split.cc index b2b70ea..646b4de 100644 --- a/base/string_split.cc +++ b/base/string_split.cc @@ -6,6 +6,8 @@ #include "base/logging.h" #include "base/string_util.h" +#include "base/third_party/icu/icu_utf.h" +#include "base/utf_string_conversions.h" namespace base { @@ -105,4 +107,51 @@ void SplitStringUsingSubstr(const std::string& str, SplitStringUsingSubstrT(str, s, r); } +template<typename STR> +static void SplitStringT(const STR& str, + const typename STR::value_type s, + bool trim_whitespace, + std::vector<STR>* r) { + size_t last = 0; + size_t i; + size_t c = str.size(); + for (i = 0; i <= c; ++i) { + if (i == c || str[i] == s) { + size_t len = i - last; + STR tmp = str.substr(last, len); + if (trim_whitespace) { + STR t_tmp; + TrimWhitespace(tmp, TRIM_ALL, &t_tmp); + r->push_back(t_tmp); + } else { + r->push_back(tmp); + } + last = i + 1; + } + } +} + +void SplitStringDontTrim(const std::wstring& str, + wchar_t c, + std::vector<std::wstring>* r) { + SplitStringT(str, c, false, r); +} + +#if !defined(WCHAR_T_IS_UTF16) +void SplitStringDontTrim(const string16& str, + char16 c, + std::vector<string16>* r) { + DCHECK(CBU16_IS_SINGLE(c)); + SplitStringT(str, c, false, r); +} +#endif + +void SplitStringDontTrim(const std::string& str, + char c, + std::vector<std::string>* r) { + DCHECK(IsStringUTF8(str)); + DCHECK(c < 0x7F); + SplitStringT(str, c, false, r); +} + } // namespace base |