caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement full support for non-pointer pointers in custom allocators for string. This completes the custom pointer support for the entire library.

Browse Source 
llvm-svn: 185167
This commit is contained in:
Howard Hinnant
2013-06-28 16:59:19 +00:00
parent e852add40e
commit eec721826c
151 changed files with 5125 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
View File

@@ -14,6 +14,8 @@
#include <string>
#include <cassert>
#include "../../min_allocator.h"
template <class S>
void
test(const S& s, typename S::value_type c, typename S::size_type pos,
@@ -33,10 +35,10 @@ test(const S& s, typename S::value_type c, typename S::size_type x)
assert(x < s.size());
}
typedef std::string S;
int main()
{
{
typedef std::string S;
test(S(""), 'e', 0, S::npos);
test(S(""), 'e', 1, S::npos);
test(S("kitcj"), 'e', 0, S::npos);
@@ -62,4 +64,35 @@ int main()
test(S("csope"), 'e', 4);
test(S("gfsmthlkon"), 'e', S::npos);
test(S("laenfsbridchgotmkqpj"), 'e', 2);
}
#if __cplusplus >= 201103L
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
test(S(""), 'e', 0, S::npos);
test(S(""), 'e', 1, S::npos);
test(S("kitcj"), 'e', 0, S::npos);
test(S("qkamf"), 'e', 1, S::npos);
test(S("nhmko"), 'e', 2, S::npos);
test(S("tpsaf"), 'e', 4, S::npos);
test(S("lahfb"), 'e', 5, S::npos);
test(S("irkhs"), 'e', 6, S::npos);
test(S("gmfhdaipsr"), 'e', 0, S::npos);
test(S("kantesmpgj"), 'e', 1, 4);
test(S("odaftiegpm"), 'e', 5, 6);
test(S("oknlrstdpi"), 'e', 9, S::npos);
test(S("eolhfgpjqk"), 'e', 10, S::npos);
test(S("pcdrofikas"), 'e', 11, S::npos);
test(S("nbatdlmekrgcfqsophij"), 'e', 0, 7);
test(S("bnrpehidofmqtcksjgla"), 'e', 1, 4);
test(S("jdmciepkaqgotsrfnhlb"), 'e', 10, S::npos);
test(S("jtdaefblsokrmhpgcnqi"), 'e', 19, S::npos);
test(S("hkbgspofltajcnedqmri"), 'e', 20, S::npos);
test(S("oselktgbcapndfjihrmq"), 'e', 21, S::npos);
test(S(""), 'e', S::npos);
test(S("csope"), 'e', 4);
test(S("gfsmthlkon"), 'e', S::npos);
test(S("laenfsbridchgotmkqpj"), 'e', 2);
}
#endif
}

20
libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
View File

@@ -14,6 +14,8 @@
#include <string>
#include <cassert>
#include "../../min_allocator.h"
template <class S>
void
test(const S& s, const typename S::value_type* str, typename S::size_type pos,
@@ -33,8 +35,7 @@ test(const S& s, const typename S::value_type* str, typename S::size_type x)
assert(x < s.size());
}
typedef std::string S;
template <class S>
void test0()
{
test(S(""), "", 0, S::npos);
@@ -119,6 +120,7 @@ void test0()
test(S("lecfratdjkhnsmqpoigb"), "tpflmdnoicjgkberhqsa", 21, S::npos);
}
template <class S>
void test1()
{
test(S(""), "", S::npos);
@@ -141,6 +143,16 @@ void test1()
int main()
{
test0();
test1();
{
typedef std::string S;
test0<S>();
test1<S>();
}
#if __cplusplus >= 201103L
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
test0<S>();
test1<S>();
}
#endif
}

28
libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
View File

@@ -14,6 +14,8 @@
#include <string>
#include <cassert>
#include "../../min_allocator.h"
template <class S>
void
test(const S& s, const typename S::value_type* str, typename S::size_type pos,
@@ -24,8 +26,7 @@ test(const S& s, const typename S::value_type* str, typename S::size_type pos,
assert(pos <= x && x < s.size());
}
typedef std::string S;
template <class S>
void test0()
{
test(S(""), "", 0, 0, S::npos);
@@ -130,6 +131,7 @@ void test0()
test(S("hkjae"), "dfsmk", 5, 2, S::npos);
}
template <class S>
void test1()
{
test(S("gbhqo"), "skqne", 5, 4, S::npos);
@@ -234,6 +236,7 @@ void test1()
test(S("iomkfthagj"), "oaklidrbqg", 10, 1, S::npos);
}
template <class S>
void test2()
{
test(S("sdpcilonqj"), "dnjfsagktr", 10, 5, S::npos);
@@ -338,6 +341,7 @@ void test2()
test(S("lifhpdgmbconstjeqark"), "tomglrkencbsfjqpihda", 20, 0, S::npos);
}
template <class S>
void test3()
{
test(S("pboqganrhedjmltsicfk"), "gbkhdnpoietfcmrslajq", 20, 1, S::npos);
@@ -364,8 +368,20 @@ void test3()
int main()
{
test0();
test1();
test2();
test3();
{
typedef std::string S;
test0<S>();
test1<S>();
test2<S>();
test3<S>();
}
#if __cplusplus >= 201103L
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
test0<S>();
test1<S>();
test2<S>();
test3<S>();
}
#endif
}

20
libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
View File

@@ -14,6 +14,8 @@
#include <string>
#include <cassert>
#include "../../min_allocator.h"
template <class S>
void
test(const S& s, const S& str, typename S::size_type pos, typename S::size_type x)
@@ -32,8 +34,7 @@ test(const S& s, const S& str, typename S::size_type x)
assert(x < s.size());
}
typedef std::string S;
template <class S>
void test0()
{
test(S(""), S(""), 0, S::npos);
@@ -118,6 +119,7 @@ void test0()
test(S("lecfratdjkhnsmqpoigb"), S("tpflmdnoicjgkberhqsa"), 21, S::npos);
}
template <class S>
void test1()
{
test(S(""), S(""), S::npos);
@@ -140,6 +142,16 @@ void test1()
int main()
{
test0();
test1();
{
typedef std::string S;
test0<S>();
test1<S>();
}
#if __cplusplus >= 201103L
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
test0<S>();
test1<S>();
}
#endif
}