diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/string_util.cc | 66 | ||||
| -rw-r--r-- | base/string_util.h | 15 |
2 files changed, 71 insertions, 10 deletions
diff --git a/base/string_util.cc b/base/string_util.cc index e02aa90..5d15299 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -751,6 +751,12 @@ bool LowerCaseEqualsASCII(const std::wstring& a, const char* b) { return DoLowerCaseEqualsASCII(a.begin(), a.end(), b); } +#if !defined(WCHAR_T_IS_UTF16) +bool LowerCaseEqualsASCII(const string16& a, const char* b) { + return DoLowerCaseEqualsASCII(a.begin(), a.end(), b); +} +#endif + bool LowerCaseEqualsASCII(std::string::const_iterator a_begin, std::string::const_iterator a_end, const char* b) { @@ -762,17 +768,35 @@ bool LowerCaseEqualsASCII(std::wstring::const_iterator a_begin, const char* b) { return DoLowerCaseEqualsASCII(a_begin, a_end, b); } + +#if !defined(WCHAR_T_IS_UTF16) +bool LowerCaseEqualsASCII(string16::const_iterator a_begin, + string16::const_iterator a_end, + const char* b) { + return DoLowerCaseEqualsASCII(a_begin, a_end, b); +} +#endif + bool LowerCaseEqualsASCII(const char* a_begin, const char* a_end, const char* b) { return DoLowerCaseEqualsASCII(a_begin, a_end, b); } + bool LowerCaseEqualsASCII(const wchar_t* a_begin, const wchar_t* a_end, const char* b) { return DoLowerCaseEqualsASCII(a_begin, a_end, b); } +#if !defined(WCHAR_T_IS_UTF16) +bool LowerCaseEqualsASCII(const char16* a_begin, + const char16* a_end, + const char* b) { + return DoLowerCaseEqualsASCII(a_begin, a_end, b); +} +#endif + bool EqualsASCII(const string16& a, const base::StringPiece& b) { if (a.length() != b.length()) return false; @@ -788,24 +812,34 @@ bool StartsWithASCII(const std::string& str, return base::strncasecmp(str.c_str(), search.c_str(), search.length()) == 0; } -bool StartsWith(const std::wstring& str, - const std::wstring& search, - bool case_sensitive) { +template <typename STR> +bool StartsWithT(const STR& str, const STR& search, bool case_sensitive) { if (case_sensitive) return str.compare(0, search.length(), search) == 0; else { if (search.size() > str.size()) return false; return std::equal(search.begin(), search.end(), str.begin(), - CaseInsensitiveCompare<wchar_t>()); + CaseInsensitiveCompare<typename STR::value_type>()); } } -bool EndsWith(const std::wstring& str, - const std::wstring& search, - bool case_sensitive) { - std::wstring::size_type str_length = str.length(); - std::wstring::size_type search_length = search.length(); +bool StartsWith(const std::wstring& str, const std::wstring& search, + bool case_sensitive) { + return StartsWithT(str, search, case_sensitive); +} + +#if !defined(WCHAR_T_IS_UTF16) +bool StartsWith(const string16& str, const string16& search, + bool case_sensitive) { + return StartsWithT(str, search, case_sensitive); +} +#endif + +template <typename STR> +bool EndsWithT(const STR& str, const STR& search, bool case_sensitive) { + typename STR::size_type str_length = str.length(); + typename STR::size_type search_length = search.length(); if (search_length > str_length) return false; if (case_sensitive) { @@ -813,10 +847,22 @@ bool EndsWith(const std::wstring& str, } else { return std::equal(search.begin(), search.end(), str.begin() + (str_length - search_length), - CaseInsensitiveCompare<wchar_t>()); + CaseInsensitiveCompare<typename STR::value_type>()); } } +bool EndsWith(const std::wstring& str, const std::wstring& search, + bool case_sensitive) { + return EndsWithT(str, search, case_sensitive); +} + +#if !defined(WCHAR_T_IS_UTF16) +bool EndsWith(const string16& str, const string16& search, + bool case_sensitive) { + return EndsWithT(str, search, case_sensitive); +} +#endif + DataUnits GetByteDisplayUnits(int64 bytes) { // The byte thresholds at which we display amounts. A byte count is displayed // in unit U when kUnitThresholds[U] <= bytes < kUnitThresholds[U+1]. diff --git a/base/string_util.h b/base/string_util.h index 5f7afea..f1eaa4e 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -251,6 +251,7 @@ template <class str> inline str StringToUpperASCII(const str& s) { // borrowed from the equivalent APIs in Mozilla. bool LowerCaseEqualsASCII(const std::string& a, const char* b); bool LowerCaseEqualsASCII(const std::wstring& a, const char* b); +bool LowerCaseEqualsASCII(const string16& a, const char* b); // Same thing, but with string iterators instead. bool LowerCaseEqualsASCII(std::string::const_iterator a_begin, @@ -259,12 +260,18 @@ bool LowerCaseEqualsASCII(std::string::const_iterator a_begin, bool LowerCaseEqualsASCII(std::wstring::const_iterator a_begin, std::wstring::const_iterator a_end, const char* b); +bool LowerCaseEqualsASCII(string16::const_iterator a_begin, + string16::const_iterator a_end, + const char* b); bool LowerCaseEqualsASCII(const char* a_begin, const char* a_end, const char* b); bool LowerCaseEqualsASCII(const wchar_t* a_begin, const wchar_t* a_end, const char* b); +bool LowerCaseEqualsASCII(const char16* a_begin, + const char16* a_end, + const char* b); // Performs a case-sensitive string compare. The behavior is undefined if both // strings are not ASCII. @@ -277,11 +284,17 @@ bool StartsWithASCII(const std::string& str, bool StartsWith(const std::wstring& str, const std::wstring& search, bool case_sensitive); +bool StartsWith(const string16& str, + const string16& search, + bool case_sensitive); // Returns true if str ends with search, or false otherwise. bool EndsWith(const std::wstring& str, const std::wstring& search, bool case_sensitive); +bool EndsWith(const string16& str, + const string16& search, + bool case_sensitive); // Determines the type of ASCII character, independent of locale (the C @@ -467,6 +480,8 @@ inline typename string_type::value_type* WriteInto(string_type* str, template<typename Char> struct CaseInsensitiveCompare { public: bool operator()(Char x, Char y) const { + // TODO(darin): Do we really want to do locale sensitive comparisons here? + // See http://crbug.com/24917 return tolower(x) == tolower(y); } }; |