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

[libcxx][nfc] prefixes test type input_iterator with cpp17_

Browse Source 
C++20 revised the definition of what it means to be an iterator. While
all _Cpp17InputIterators_ satisfy `std::input_iterator`, the reverse
isn't true. D100271 introduces a new test adaptor to accommodate this
new definition (`cpp20_input_iterator`).

In order to help readers immediately distinguish which input iterator
adaptor is _Cpp17InputIterator_, the current `input_iterator` adaptor
has been prefixed with `cpp17_`.

Differential Revision: https://reviews.llvm.org/D101242
This commit is contained in:
Christopher Di Bella
2021-04-24 21:31:23 +00:00
parent d4d1caafc8
commit 773ae44124
212 changed files with 1531 additions and 1527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
View File

@@ -80,38 +80,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#if TEST_STD_VER >= 11
@@ -139,38 +139,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
@@ -178,7 +178,7 @@ int main(int, char**)
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
typedef input_iterator<TIter> IIter;
typedef cpp17_input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S(), IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S(), IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());