[libcxx] r222159 - Reworked mismatch tests to count the number of comparisons, and make sure we are conforming with LWG2404. We are
Marshall Clow
mclow.lists at gmail.com
Mon Nov 17 10:52:25 PST 2014
Author: marshall
Date: Mon Nov 17 12:52:25 2014
New Revision: 222159
URL: http://llvm.org/viewvc/llvm-project?rev=222159&view=rev
Log:
Reworked mismatch tests to count the number of comparisons, and make sure we are conforming with LWG2404. We are
Modified:
libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
Modified: libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp?rev=222159&r1=222158&r2=222159&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp Mon Nov 17 12:52:25 2014
@@ -28,39 +28,26 @@ int main()
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
- assert(std::mismatch(input_iterator<const int*>(ia),
- 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),
- comma_iterator<const int*>(ia + sa),
- comma_iterator<const int*>(ib)) ==
- (std::pair<comma_iterator<const int*>,
- comma_iterator<const int*> >(
- comma_iterator<const int*>(ia+3),
- comma_iterator<const int*>(ib+3))));
+ const unsigned sb = sizeof(ib)/sizeof(ib[0]);
+
+ typedef input_iterator<const int*> II;
+ typedef random_access_iterator<const int*> RAI;
+
+ assert(std::mismatch(II(ia), II(ia + sa), II(ib))
+ == (std::pair<II, II>(II(ia+3), II(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
- assert(std::mismatch(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
- 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),
- input_iterator<const int*>(ia + sa),
- input_iterator<const int*>(ib),
- input_iterator<const int*>(ib + 2)) ==
- (std::pair<input_iterator<const int*>,
- input_iterator<const int*> >(
- input_iterator<const int*>(ia+2),
- input_iterator<const int*>(ib+2))));
+ assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+sb))
+ == (std::pair<II, II>(II(ia+3), II(ib+3))));
+
+ assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), II(ib+sb))
+ == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3)))));
+
+
+ assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib+2))
+ == (std::pair<II, II>(II(ia+2), II(ib+2))));
#endif
}
Modified: libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp?rev=222159&r1=222158&r2=222159&view=diff
==============================================================================
--- libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp (original)
+++ libcxx/trunk/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp Mon Nov 17 12:52:25 2014
@@ -20,6 +20,7 @@
#include <cassert>
#include "test_iterators.h"
+#include "counting_predicates.hpp"
#if _LIBCPP_STD_VER > 11
#define HAS_FOUR_ITERATOR_VERSION
@@ -31,40 +32,41 @@ int main()
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
- assert(std::mismatch(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
- input_iterator<const int*>(ib),
- std::equal_to<int>()) ==
- (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),
- comma_iterator<const int*>(ia + sa),
- comma_iterator<const int*>(ib),
- std::equal_to<int>()) ==
- (std::pair<comma_iterator<const int*>,
- comma_iterator<const int*> >(
- comma_iterator<const int*>(ia+3),
- comma_iterator<const int*>(ib+3))));
+ const unsigned sb = sizeof(ib)/sizeof(ib[0]);
+
+ typedef input_iterator<const int*> II;
+ typedef random_access_iterator<const int*> RAI;
+ typedef std::equal_to<int> EQ;
+
+ assert(std::mismatch(II(ia), II(ia + sa), II(ib), EQ())
+ == (std::pair<II, II>(II(ia+3), II(ib+3))));
+ assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), EQ())
+ == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
+
+ binary_counting_predicate<EQ, int> bcp((EQ()));
+ assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), std::ref(bcp))
+ == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
+ assert(bcp.count() > 0 && bcp.count() < sa);
+ bcp.reset();
+
#ifdef HAS_FOUR_ITERATOR_VERSION
- assert(std::mismatch(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
- input_iterator<const int*>(ib),
- input_iterator<const int*>(ib + sa),
- std::equal_to<int>()) ==
- (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(II(ia), II(ia + sa), II(ib), II(ib + sb), EQ())
+ == (std::pair<II, II>(II(ia+3), II(ib+3))));
+ assert(std::mismatch(RAI(ia), RAI(ia + sa), RAI(ib), RAI(ib + sb), EQ())
+ == (std::pair<RAI, RAI>(RAI(ia+3), RAI(ib+3))));
+
+ assert(std::mismatch(II(ia), II(ia + sa), II(ib), II(ib + sa), bcp)
+ == (std::pair<II, II>(II(ia+3), II(ib+3))));
+ assert(bcp.count() > 0 && bcp.count() < std::min(sa, sb));
#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)));
+
#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)));
- 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)));
#endif
}
More information about the cfe-commits
mailing list