generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the test for zero-length into the char_traits (from string_view). Add tests to char_traits specializations

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@228981 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2015-02-12 23:34:52 +00:00
parent 7f59a88431
commit f2e36ef093
6 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/experimental/string_view
View File

@ -375,7 +375,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
_LIBCPP_CONSTEXPR_AFTER_CXX11 int compare(basic_string_view __sv) const _NOEXCEPT
{
size_type __rlen = _VSTD::min( size(), __sv.size());
int __retval = __rlen == 0 ? 0 : _Traits::compare(data(), __sv.data(), __rlen);
int __retval = _Traits::compare(data(), __sv.data(), __rlen);
if ( __retval == 0 ) // first __rlen chars matched
__retval = size() == __sv.size() ? 0 : ( size() < __sv.size() ? -1 : 1 );
return __retval;

4
include/string
View File

@ -636,7 +636,7 @@ struct _LIBCPP_TYPE_VIS_ONLY char_traits<char>
{return (unsigned char)__c1 < (unsigned char)__c2;}
static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
{return memcmp(__s1, __s2, __n);}
{return __n == 0 ? 0 : memcmp(__s1, __s2, __n);}
static inline size_t length(const char_type* __s) {return strlen(__s);}
static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
{return (const char_type*)memchr(__s, to_int_type(__a), __n);}
@ -681,7 +681,7 @@ struct _LIBCPP_TYPE_VIS_ONLY char_traits<wchar_t>
{return __c1 < __c2;}
static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
{return wmemcmp(__s1, __s2, __n);}
{return __n == 0 ? 0 : wmemcmp(__s1, __s2, __n);}
static inline size_t length(const char_type* __s)
{return wcslen(__s);}
static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)

1
test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare.pass.cpp
View File

@ -19,6 +19,7 @@
int main()
{
assert(std::char_traits<char>::compare("", "", 0) == 0);
assert(std::char_traits<char>::compare(NULL, NULL, 0) == 0);
assert(std::char_traits<char>::compare("1", "1", 1) == 0);
assert(std::char_traits<char>::compare("1", "2", 1) < 0);

1
test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
View File

@ -21,6 +21,7 @@ int main()
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
#if __cplusplus >= 201103L
assert(std::char_traits<char16_t>::compare(u"", u"", 0) == 0);
assert(std::char_traits<char16_t>::compare(NULL, NULL, 0) == 0);
assert(std::char_traits<char16_t>::compare(u"1", u"1", 1) == 0);
assert(std::char_traits<char16_t>::compare(u"1", u"2", 1) < 0);

1
test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
View File

@ -21,6 +21,7 @@ int main()
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
#if __cplusplus >= 201103L
assert(std::char_traits<char32_t>::compare(U"", U"", 0) == 0);
assert(std::char_traits<char32_t>::compare(NULL, NULL, 0) == 0);
assert(std::char_traits<char32_t>::compare(U"1", U"1", 1) == 0);
assert(std::char_traits<char32_t>::compare(U"1", U"2", 1) < 0);

1
test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare.pass.cpp
View File

@ -19,6 +19,7 @@
int main()
{
assert(std::char_traits<wchar_t>::compare(L"", L"", 0) == 0);
assert(std::char_traits<wchar_t>::compare(NULL, NULL, 0) == 0);
assert(std::char_traits<wchar_t>::compare(L"1", L"1", 1) == 0);
assert(std::char_traits<wchar_t>::compare(L"1", L"2", 1) < 0);