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

Implement LWG #2268: Setting a default argument in the declaration of a member function assign of std::basic_string.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@202876 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2014-03-04 19:17:19 +00:00
parent be8a99ad0f
commit a93b5e27a8
6 changed files with 189 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
View File

@@ -10,7 +10,8 @@
// <string>
// basic_string<charT,traits,Allocator>&
// append(const basic_string<charT,traits>& str, size_type pos, size_type n);
// append(const basic_string<charT,traits>& str, size_type pos, size_type n = npos);
// the "= npos" was added for C++14
#include <string>
#include <stdexcept>
@@ -35,6 +36,23 @@ test(S s, S str, typename S::size_type pos, typename S::size_type n, S expected)
}
}
template <class S>
void
test_npos(S s, S str, typename S::size_type pos, S expected)
{
try
{
s.append(str, pos);
assert(s.__invariants());
assert(pos <= str.size());
assert(s == expected);
}
catch (std::out_of_range&)
{
assert(pos > str.size());
}
}
int main()
{
{
@@ -87,4 +105,14 @@ int main()
S("123456789012345678906789012345"));
}
#endif
{
typedef std::string S;
test_npos(S(), S(), 0, S());
test_npos(S(), S(), 1, S());
test_npos(S(), S("12345"), 0, S("12345"));
test_npos(S(), S("12345"), 1, S("2345"));
test_npos(S(), S("12345"), 3, S("45"));
test_npos(S(), S("12345"), 5, S(""));
test_npos(S(), S("12345"), 6, S("not happening"));
}
}

30
test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
View File

@@ -10,7 +10,8 @@
// <string>
// basic_string<charT,traits,Allocator>&
// assign(const basic_string<charT,traits>& str, size_type pos, size_type n);
// assign(const basic_string<charT,traits>& str, size_type pos, size_type n=npos);
// the =npos was added for C++14
#include <string>
#include <stdexcept>
@@ -35,6 +36,23 @@ test(S s, S str, typename S::size_type pos, typename S::size_type n, S expected)
}
}
template <class S>
void
test_npos(S s, S str, typename S::size_type pos, S expected)
{
try
{
s.assign(str, pos);
assert(s.__invariants());
assert(pos <= str.size());
assert(s == expected);
}
catch (std::out_of_range&)
{
assert(pos > str.size());
}
}
int main()
{
{
@@ -87,4 +105,14 @@ int main()
S("6789012345"));
}
#endif
{
typedef std::string S;
test_npos(S(), S(), 0, S());
test_npos(S(), S(), 1, S());
test_npos(S(), S("12345"), 0, S("12345"));
test_npos(S(), S("12345"), 1, S("2345"));
test_npos(S(), S("12345"), 3, S("45"));
test_npos(S(), S("12345"), 5, S(""));
test_npos(S(), S("12345"), 6, S("not happening"));
}
}

43
test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
View File

@@ -11,7 +11,8 @@
// basic_string<charT,traits,Allocator>&
// insert(size_type pos1, const basic_string<charT,traits,Allocator>& str,
// size_type pos2, size_type n);
// size_type pos2, size_type n=npos);
// the "=npos" was added in C++14
#include <string>
#include <stdexcept>
@@ -40,6 +41,27 @@ test(S s, typename S::size_type pos1, S str, typename S::size_type pos2,
}
}
template <class S>
void
test_npos(S s, typename S::size_type pos1, S str, typename S::size_type pos2, S expected)
{
typename S::size_type old_size = s.size();
S s0 = s;
try
{
s.insert(pos1, str, pos2);
assert(s.__invariants());
assert(pos1 <= old_size && pos2 <= str.size());
assert(s == expected);
}
catch (std::out_of_range&)
{
assert(pos1 > old_size || pos2 > str.size());
assert(s == s0);
}
}
template <class S>
void test0()
{
@@ -1670,6 +1692,23 @@ void test29()
test(S("abcdefghijklmnopqrst"), 21, S("12345678901234567890"), 21, 0, S("can't happen"));
}
template <class S>
void test30()
{
test_npos(S(""), 0, S("12345678901234567890"), 0, S("12345678901234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 1, S( "2345678901234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 2, S( "345678901234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 3, S( "45678901234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 5, S( "678901234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 10, S( "1234567890"));
test_npos(S(""), 0, S("12345678901234567890"), 21, S("can't happen"));
test_npos(S("abcdefghijklmnopqrst"), 10, S("12345"), 0, S("abcdefghij12345klmnopqrst"));
test_npos(S("abcdefghijklmnopqrst"), 10, S("12345"), 1, S("abcdefghij2345klmnopqrst"));
test_npos(S("abcdefghijklmnopqrst"), 10, S("12345"), 3, S("abcdefghij45klmnopqrst"));
test_npos(S("abcdefghijklmnopqrst"), 10, S("12345"), 5, S("abcdefghijklmnopqrst"));
test_npos(S("abcdefghijklmnopqrst"), 10, S("12345"), 6, S("can't happen"));
}
int main()
{
{
@@ -1704,6 +1743,7 @@ int main()
test27<S>();
test28<S>();
test29<S>();
test30<S>();
}
#if __cplusplus >= 201103L
{
@@ -1738,6 +1778,7 @@ int main()
test27<S>();
test28<S>();
test29<S>();
test30<S>();
}
#endif
}

49
test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
View File

@@ -11,7 +11,8 @@
// basic_string<charT,traits,Allocator>&
// replace(size_type pos1, size_type n1, const basic_string<charT,traits,Allocator>& str,
// size_type pos2, size_type n2);
// size_type pos2, size_type n2=npos);
// the "=npos" was added in C++14
#include <string>
#include <stdexcept>
@@ -45,6 +46,32 @@ test(S s, typename S::size_type pos1, typename S::size_type n1,
}
}
template <class S>
void
test_npos(S s, typename S::size_type pos1, typename S::size_type n1,
S str, typename S::size_type pos2,
S expected)
{
typename S::size_type old_size = s.size();
S s0 = s;
try
{
s.replace(pos1, n1, str, pos2);
assert(s.__invariants());
assert(pos1 <= old_size && pos2 <= str.size());
assert(s == expected);
typename S::size_type xlen = std::min(n1, old_size - pos1);
typename S::size_type rlen = std::min(S::npos, str.size() - pos2);
assert(s.size() == old_size - xlen + rlen);
}
catch (std::out_of_range&)
{
assert(pos1 > old_size || pos2 > str.size());
assert(s == s0);
}
}
template <class S>
void test0()
{
@@ -5796,6 +5823,24 @@ void test54()
test(S("abcdefghijklmnopqrst"), 21, 0, S("12345678901234567890"), 21, 0, S("can't happen"));
}
template <class S>
void test55()
{
test_npos(S("abcdefghij"), 9, 1, S("12345678901234567890"), 10, S("abcdefghi1234567890"));
test_npos(S("abcdefghij"), 9, 1, S("12345678901234567890"), 19, S("abcdefghi0"));
test_npos(S("abcdefghij"), 9, 1, S("12345678901234567890"), 20, S("abcdefghi"));
test_npos(S("abcdefghij"), 9, 1, S("12345678901234567890"), 20, S("abcdefghi"));
test_npos(S("abcdefghij"), 9, 1, S("12345678901234567890"), 21, S("can't happen"));
test_npos(S("abcdefghij"), 9, 2, S(""), 0, S("abcdefghi"));
test_npos(S("abcdefghij"), 9, 2, S(""), 1, S("can't happen"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 0, S("abcdefghi12345"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 1, S("abcdefghi2345"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 2, S("abcdefghi345"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 4, S("abcdefghi5"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 5, S("abcdefghi"));
test_npos(S("abcdefghij"), 9, 2, S("12345"), 6, S("can't happen"));
}
int main()
{
{
@@ -5855,6 +5900,7 @@ int main()
test52<S>();
test53<S>();
test54<S>();
test55<S>();
}
#if __cplusplus >= 201103L
{
@@ -5914,6 +5960,7 @@ int main()
test52<S>();
test53<S>();
test54<S>();
test55<S>();
}
#endif
}