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

Fix test bugs found by David Chisnall

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140271 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2011-09-21 18:33:46 +00:00
parent 9e02b90405
commit 59832523ac
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
View File

@ -27,7 +27,7 @@ int main()
std::regex phone_numbers("\\d{3}-(\\d{4})");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
const int indices[] = {-1, 0, 1};
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, indices);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");

2
test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
View File

@ -26,7 +26,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-(\\d{4})");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, {-1, 0, 1});
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");

6
test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
View File

@ -24,7 +24,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, -1);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");
@ -43,7 +43,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers);
assert(i != std::cregex_token_iterator());
assert(i->str() == "555-1234");
@ -59,7 +59,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-(\\d{4})");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, 1);
assert(i != std::cregex_token_iterator());
assert(i->str() == "1234");

6
test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
View File

@ -28,7 +28,7 @@ int main()
std::vector<int> v;
v.push_back(-1);
v.push_back(-1);
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, v);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");
@ -59,7 +59,7 @@ int main()
std::vector<int> v;
v.push_back(-1);
v.push_back(0);
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, v);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");
@ -91,7 +91,7 @@ int main()
v.push_back(-1);
v.push_back(0);
v.push_back(1);
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, v);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");

2
test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
View File

@ -22,7 +22,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, -1);
assert(i != std::cregex_token_iterator());
assert(!(i == std::cregex_token_iterator()));

6
test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
View File

@ -21,7 +21,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, -1);
assert(i != std::cregex_token_iterator());
assert((*i).str() == "start ");
@ -40,7 +40,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers);
assert(i != std::cregex_token_iterator());
assert((*i).str() == "555-1234");
@ -56,7 +56,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-(\\d{4})");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, 1);
assert(i != std::cregex_token_iterator());
assert((*i).str() == "1234");

6
test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
View File

@ -21,7 +21,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, -1);
assert(i != std::cregex_token_iterator());
assert(i->str() == "start ");
@ -40,7 +40,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-\\d{4}");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers);
assert(i != std::cregex_token_iterator());
assert(i->str() == "555-1234");
@ -56,7 +56,7 @@ int main()
{
std::regex phone_numbers("\\d{3}-(\\d{4})");
const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
phone_numbers, 1);
assert(i != std::cregex_token_iterator());
assert(i->str() == "1234");