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

Reworked mismatch tests to count the number of comparisons, and make sure we are conforming with LWG2404. We are

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@222159 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2014-11-17 18:52:25 +00:00
parent cfeac66f8c
commit 36628eb77a
2 changed files with 47 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
View File

@ -28,39 +28,26 @@ int main()
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3}; int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
assert(std::mismatch(input_iterator<const int*>(ia), const unsigned sb = sizeof(ib)/sizeof(ib[0]);
input_iterator<const int*>(ia + sa),
input_iterator<const int*>(ib)) ==
(std::pair<input_iterator<const int*>,
input_iterator<const int*> >(
input_iterator<const int*>(ia+3),
input_iterator<const int*>(ib+3))));
assert(std::mismatch(comma_iterator<const int*>(ia), typedef input_iterator<const int*> II;
comma_iterator<const int*>(ia + sa), typedef random_access_iterator<const int*> RAI;
comma_iterator<const int*>(ib)) ==
(std::pair<comma_iterator<const int*>, assert(std::mismatch(II(ia), II(ia + sa), II(ib))
comma_iterator<const int*> >( == (std::pair<II, II>(II(ia+3), II(ib+3))));
comma_iterator<const int*>(ia+3),
comma_iterator<const int*>(ib+3)))); assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib))
== (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
#ifdef HAS_FOUR_ITERATOR_VERSION #ifdef HAS_FOUR_ITERATOR_VERSION
assert(std::mismatch(input_iterator<const int*>(ia), assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+sb))
input_iterator<const int*>(ia + sa), == (std::pair<II, II>(II(ia+3), II(ib+3))));
input_iterator<const int*>(ib),
input_iterator<const int*>(ib + sa)) ==
(std::pair<input_iterator<const int*>,
input_iterator<const int*> >(
input_iterator<const int*>(ia+3),
input_iterator<const int*>(ib+3))));
assert(std::mismatch(input_iterator<const int*>(ia), assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), II(ib+sb))
input_iterator<const int*>(ia + sa), == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3)))));
input_iterator<const int*>(ib),
input_iterator<const int*>(ib + 2)) ==
(std::pair<input_iterator<const int*>, assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+2))
input_iterator<const int*> >( == (std::pair<II, II>(II(ia+2), II(ib+2))));
input_iterator<const int*>(ia+2),
input_iterator<const int*>(ib+2))));
#endif #endif
} }

58
test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
View File

@ -20,6 +20,7 @@
#include <cassert> #include <cassert>
#include "test_iterators.h" #include "test_iterators.h"
#include "counting_predicates.hpp"
#if _LIBCPP_STD_VER > 11 #if _LIBCPP_STD_VER > 11
#define HAS_FOUR_ITERATOR_VERSION #define HAS_FOUR_ITERATOR_VERSION
@ -31,40 +32,41 @@ int main()
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]); const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3}; int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
assert(std::mismatch(input_iterator<const int*>(ia), const unsigned sb = sizeof(ib)/sizeof(ib[0]);
input_iterator<const int*>(ia + sa),
input_iterator<const int*>(ib), typedef input_iterator<const int*> II;
std::equal_to<int>()) == typedef random_access_iterator<const int*> RAI;
(std::pair<input_iterator<const int*>, typedef std::equal_to<int> EQ;
input_iterator<const int*> >(
input_iterator<const int*>(ia+3), assert(std::mismatch(II(ia), II(ia + sa), II(ib), EQ())
input_iterator<const int*>(ib+3)))); == (std::pair<II, II>(II(ia+3), II(ib+3))));
assert(std::mismatch(comma_iterator<const int*>(ia), assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), EQ())
comma_iterator<const int*>(ia + sa), == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
comma_iterator<const int*>(ib),
std::equal_to<int>()) == binary_counting_predicate<EQ, int> bcp((EQ()));
(std::pair<comma_iterator<const int*>, assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), std::ref(bcp))
comma_iterator<const int*> >( == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
comma_iterator<const int*>(ia+3), assert(bcp.count() > 0 && bcp.count() < sa);
comma_iterator<const int*>(ib+3)))); bcp.reset();
#ifdef HAS_FOUR_ITERATOR_VERSION #ifdef HAS_FOUR_ITERATOR_VERSION
assert(std::mismatch(input_iterator<const int*>(ia), assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sb), EQ())
input_iterator<const int*>(ia + sa), == (std::pair<II, II>(II(ia+3), II(ib+3))));
input_iterator<const int*>(ib), assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib + sb), EQ())
input_iterator<const int*>(ib + sa), == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
std::equal_to<int>()) ==
(std::pair<input_iterator<const int*>, assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sa), bcp)
input_iterator<const int*> >( == (std::pair<II, II>(II(ia+3), II(ib+3))));
input_iterator<const int*>(ia+3), assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb));
input_iterator<const int*>(ib+3))));
#endif #endif
assert(std::mismatch(ia, ia + sa, ib, std::equal_to<int>()) == assert(std::mismatch(ia, ia + sa, ib, EQ()) ==
(std::pair<int*,int*>(ia+3,ib+3))); (std::pair<int*,int*>(ia+3,ib+3)));
#ifdef HAS_FOUR_ITERATOR_VERSION #ifdef HAS_FOUR_ITERATOR_VERSION
assert(std::mismatch(ia, ia + sa, ib, ib + sa, std::equal_to<int>()) == assert(std::mismatch(ia, ia + sa, ib, ib + sb, EQ()) ==
(std::pair<int*,int*>(ia+3,ib+3))); (std::pair<int*,int*>(ia+3,ib+3)));
assert(std::mismatch(ia, ia + sa, ib, ib + 2, std::equal_to<int>()) == assert(std::mismatch(ia, ia + sa, ib, ib + 2, EQ()) ==
(std::pair<int*,int*>(ia+2,ib+2))); (std::pair<int*,int*>(ia+2,ib+2)));
#endif #endif
} }