From f0f1bca8615b4949e30903f19b5c7152b9813b59 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 4 Aug 2014 17:32:25 +0000 Subject: [PATCH] Fix PR#202520 - predicate called too many times in list::remove_if. Add tests for list, forward_list, and the std::remove_if algorithm git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@214736 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/list | 4 ++ .../alg.remove/remove_if.pass.cpp | 8 ++- .../forwardlist.ops/remove_if.pass.cpp | 52 +++++++++++++++---- .../list/list.ops/remove_if.pass.cpp | 25 ++++++++- test/support/counting_predicates.hpp | 9 ++-- 5 files changed, 79 insertions(+), 19 deletions(-) diff --git a/include/list b/include/list index 800a1a3f..7ccc778c 100644 --- a/include/list +++ b/include/list @@ -2046,6 +2046,8 @@ list<_Tp, _Alloc>::remove(const value_type& __x) for (; __j != __e && *__j == __x; ++__j) ; __i = erase(__i, __j); + if (__i != __e) + __i = _VSTD::next(__i); } else ++__i; @@ -2065,6 +2067,8 @@ list<_Tp, _Alloc>::remove_if(_Pred __pred) for (; __j != __e && __pred(*__j); ++__j) ; __i = erase(__i, __j); + if (__i != __e) + __i = _VSTD::next(__i); } else ++__i; diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp index 6da3a677..b2344312 100644 --- a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp @@ -23,6 +23,9 @@ #endif #include "test_iterators.h" +#include "counting_predicates.hpp" + +bool equal2 ( int i ) { return i == 2; } template void @@ -30,7 +33,9 @@ test() { int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - int* r = std::remove_if(ia, ia+sa, std::bind2nd(std::equal_to(), 2)); +// int* r = std::remove_if(ia, ia+sa, std::bind2nd(std::equal_to(), 2)); + unary_counting_predicate cp(equal2); + int* r = std::remove_if(ia, ia+sa, std::ref(cp)); assert(r == ia + sa-3); assert(ia[0] == 0); assert(ia[1] == 1); @@ -38,6 +43,7 @@ test() assert(ia[3] == 4); assert(ia[4] == 3); assert(ia[5] == 4); + assert(cp.count() == sa); } #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp index 4c4e80c3..ed408fbd 100644 --- a/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp +++ b/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp @@ -16,6 +16,8 @@ #include #include "min_allocator.h" +#include "counting_predicates.hpp" + bool g(int i) { @@ -26,98 +28,128 @@ int main() { { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list C; const T t1[] = {0, 5, 5, 0, 0, 0, 5}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list C; const T t1[] = {0, 0, 0, 0}; C c1(std::begin(t1), std::end(t1)); C c2; - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list C; const T t1[] = {5, 5, 5}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list C; C c1; C c2; - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == 0); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list C; const T t1[] = {5, 5, 5, 0}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } #if __cplusplus >= 201103L { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list> C; const T t1[] = {0, 5, 5, 0, 0, 0, 5}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list> C; const T t1[] = {0, 0, 0, 0}; C c1(std::begin(t1), std::end(t1)); C c2; - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list> C; const T t1[] = {5, 5, 5}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list> C; C c1; C c2; - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == 0); } { typedef int T; + typedef unary_counting_predicate Predicate; typedef std::forward_list> C; const T t1[] = {5, 5, 5, 0}; const T t2[] = {5, 5, 5}; C c1(std::begin(t1), std::end(t1)); C c2(std::begin(t2), std::end(t2)); - c1.remove_if(g); + Predicate cp(g); + c1.remove_if(std::ref(cp)); assert(c1 == c2); + assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } #endif } diff --git a/test/containers/sequences/list/list.ops/remove_if.pass.cpp b/test/containers/sequences/list/list.ops/remove_if.pass.cpp index b45562ab..162919ed 100644 --- a/test/containers/sequences/list/list.ops/remove_if.pass.cpp +++ b/test/containers/sequences/list/list.ops/remove_if.pass.cpp @@ -16,28 +16,49 @@ #include #include "min_allocator.h" +#include "counting_predicates.hpp" + +bool even(int i) +{ + return i % 2 == 0; +} bool g(int i) { return i < 3; } +typedef unary_counting_predicate Predicate; + int main() { { int a1[] = {1, 2, 3, 4}; int a2[] = {3, 4}; std::list c(a1, a1+4); - c.remove_if(g); + Predicate cp(g); + c.remove_if(std::ref(cp)); assert(c == std::list(a2, a2+2)); + assert(cp.count() == 4); + } + { + int a1[] = {1, 2, 3, 4}; + int a2[] = {1, 3}; + std::list c(a1, a1+4); + Predicate cp(even); + c.remove_if(std::ref(cp)); + assert(c == std::list(a2, a2+2)); + assert(cp.count() == 4); } #if __cplusplus >= 201103L { int a1[] = {1, 2, 3, 4}; int a2[] = {3, 4}; std::list> c(a1, a1+4); - c.remove_if(g); + Predicate cp(g); + c.remove_if(std::ref(cp)); assert((c == std::list>(a2, a2+2))); + assert(cp.count() == 4); } #endif } diff --git a/test/support/counting_predicates.hpp b/test/support/counting_predicates.hpp index 4e0f8fb7..e825848f 100644 --- a/test/support/counting_predicates.hpp +++ b/test/support/counting_predicates.hpp @@ -11,16 +11,13 @@ #define __COUNTING_PREDICATES_H -template -struct unary_counting_predicate { +template +struct unary_counting_predicate : public std::unary_function { public: unary_counting_predicate(Predicate p) : p_(p), count_(0) {} ~unary_counting_predicate() {} - typedef typename Predicate::argument_type argument_type; - typedef bool result_type; - - bool operator () (const argument_type &a) const { ++count_; return p_(a); } + bool operator () (const Arg &a) const { ++count_; return p_(a); } size_t count() const { return count_; } void reset() { count_ = 0; }