Index: uspace/lib/cpp/Makefile =================================================================== --- uspace/lib/cpp/Makefile (revision 69cc156f04ce61a5e531de44a1b59899507959ec) +++ uspace/lib/cpp/Makefile (revision 09416c12bf26443d3dab88c6f2835b9d9f674d86) @@ -56,4 +56,5 @@ src/__bits/trycatch.cpp \ src/__bits/unwind.cpp \ + src/__bits/test/algorithm.cpp \ src/__bits/test/adaptors.cpp \ src/__bits/test/array.cpp \ Index: uspace/lib/cpp/include/__bits/test/tests.hpp =================================================================== --- uspace/lib/cpp/include/__bits/test/tests.hpp (revision 69cc156f04ce61a5e531de44a1b59899507959ec) +++ uspace/lib/cpp/include/__bits/test/tests.hpp (revision 09416c12bf26443d3dab88c6f2835b9d9f674d86) @@ -285,4 +285,13 @@ void test_bind(); }; + + class algorithm_test: public test_suite + { + public: + bool run(bool) override; + const char* name() override; + private: + void test_non_modifying(); + }; } Index: uspace/lib/cpp/include/impl/algorithm.hpp =================================================================== --- uspace/lib/cpp/include/impl/algorithm.hpp (revision 69cc156f04ce61a5e531de44a1b59899507959ec) +++ uspace/lib/cpp/include/impl/algorithm.hpp (revision 09416c12bf26443d3dab88c6f2835b9d9f674d86) @@ -88,5 +88,4 @@ */ - // TODO: Function has to be MoveConstructible template Function for_each(InputIterator first, InputIterator last, Function f) @@ -204,5 +203,5 @@ template typename iterator_traits::difference_type - count(InputIterator first, InputIterator last, Predicate pred) + count_if(InputIterator first, InputIterator last, Predicate pred) { typename iterator_traits::difference_type cnt{}; Index: uspace/lib/cpp/src/__bits/test/algorithm.cpp =================================================================== --- uspace/lib/cpp/src/__bits/test/algorithm.cpp (revision 09416c12bf26443d3dab88c6f2835b9d9f674d86) +++ uspace/lib/cpp/src/__bits/test/algorithm.cpp (revision 09416c12bf26443d3dab88c6f2835b9d9f674d86) @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2018 Jaroslav Jindrak + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <__bits/test/tests.hpp> +#include +#include +#include + +namespace std::test +{ + bool algorithm_test::run(bool report) + { + report_ = report; + start(); + + test_non_modifying(); + + return end(); + } + + const char* algorithm_test::name() + { + return "algorithm"; + } + + void algorithm_test::test_non_modifying() + { + auto data1 = {1, 2, 3, 4, 5}; + auto res1 = std::all_of( + data1.begin(), data1.end(), + [](auto x){ return x > 0; } + ); + auto res2 = std::all_of( + data1.begin(), data1.end(), + [](auto x){ return x < 4; } + ); + + test("all_of pt1", res1); + test("all_of pt2", !res2); + + auto res3 = std::any_of( + data1.begin(), data1.end(), + [](auto x){ return x > 4; } + ); + auto res4 = std::any_of( + data1.begin(), data1.end(), + [](auto x){ return x == 10; } + ); + + test("any_of pt1", res3); + test("any_of pt2", !res4); + + auto res5 = std::none_of( + data1.begin(), data1.end(), + [](auto x){ return x < 0; } + ); + auto res6 = std::none_of( + data1.begin(), data1.end(), + [](auto x){ return x == 4; } + ); + + test("none_of pt1", res5); + test("none_of pt2", !res6); + + std::array data2{1, 2, 3, 4, 5}; + auto check1 = {1, 20, 3, 40, 5}; + std::for_each( + data2.begin(), data2.end(), + [](auto& x){ + if (x % 2 == 0) + x *= 10; + } + ); + + test_eq( + "for_each", check1.begin(), check1.end(), + data2.begin(), data2.end() + ); + + auto res7 = std::find(data2.begin(), data2.end(), 40); + test_eq("find", res7, &data2[3]); + + auto res8 = std::find_if( + data2.begin(), data2.end(), + [](auto x){ return x > 30; } + ); + test_eq("find_if", res8, &data2[3]); + + auto res9 = std::find_if_not( + data2.begin(), data2.end(), + [](auto x){ return x < 30; } + ); + test_eq("find_if_not", res9, &data2[3]); + + // TODO: find_end, find_first_of + + std::array data3{1, 2, 3, 3, 4, 6, 5}; + auto res10 = std::adjacent_find(data3.begin(), data3.end()); + test_eq("adjacent_find pt1", res10, &data3[2]); + + auto res11 = std::adjacent_find( + data3.begin(), data3.end(), + [](auto lhs, auto rhs){ + return rhs < lhs; + } + ); + test_eq("adjacent_find pt2", res11, &data3[5]); + + auto res12 = std::count(data3.begin(), data3.end(), 3); + test_eq("count", res12, 2); + + auto res13 = std::count_if( + data3.begin(), data3.end(), + [](auto x){ + return x % 2 == 1; + } + ); + test_eq("count_if", res13, 4); + } +}