diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 27a866b05c2..c8c6af9cc68 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2008-06-28 Paolo Carlini + + * include/bits/stl_algo.h (partition_point): Add in C++0x mode. + * include/bits/algorithmfwd.h: Add. + * testsuite/25_algorithms/headers/algorithm/synopsis.cc: Update. + * testsuite/25_algorithms/partition_point/1.cc: New. + * testsuite/25_algorithms/partition_point/check_type.cc: Likewise. + * testsuite/25_algorithms/partition_point/requirements/ + explicit_instantiation/2.cc: Likewise. + * testsuite/25_algorithms/partition_point/requirements/ + explicit_instantiation/pod.cc: Likewise. + 2008-06-28 Paolo Carlini PR libstdc++/36660 diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index 4b78983517e..23c4970dcf6 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -71,6 +71,7 @@ partial_sort_copy partition partition_copy (C++0x) + partition_point (C++0x) pop_heap prev_permutation push_heap @@ -346,6 +347,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typename _OIter2, typename _Predicate> pair<_OIter1, _OIter2> partition_copy(_IIter, _IIter, _OIter1, _OIter2, _Predicate); + + template + _FIter + partition_point(_FIter, _FIter, _Predicate); #endif template diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index f0199a43946..61f7003040f 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -817,6 +817,51 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __first = std::find_if_not(__first, __last, __pred); return std::none_of(__first, __last, __pred); } + + /** + * @brief Find the partition point of a partitioned range. + * @param first An iterator. + * @param last Another iterator. + * @param pred A predicate. + * @return An iterator @p mid such that @p all_of(first, mid, pred) + * and @p none_of(mid, last, pred) are both true. + */ + template + _ForwardIterator + partition_point(_ForwardIterator __first, _ForwardIterator __last, + _Predicate __pred) + { + // concept requirements + __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>) + __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate, + typename iterator_traits<_ForwardIterator>::value_type>) + + // A specific debug-mode test will be necessary... + __glibcxx_requires_valid_range(__first, __last); + + typedef typename iterator_traits<_ForwardIterator>::difference_type + _DistanceType; + + _DistanceType __len = std::distance(__first, __last); + _DistanceType __half; + _ForwardIterator __middle; + + while (__len > 0) + { + __half = __len >> 1; + __middle = __first; + std::advance(__middle, __half); + if (__pred(*__middle)) + { + __first = __middle; + ++__first; + __len = __len - __half - 1; + } + else + __len = __half; + } + return __first; + } #endif diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc index 8aa882aa949..005892d70e2 100644 --- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc @@ -55,6 +55,10 @@ namespace std template bool is_partitioned(_IIter, _IIter, _Predicate); + + template + _FIter + partition_point(_FIter, _FIter, _Predicate); #endif template diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc b/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc new file mode 100644 index 00000000000..5360739732f --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partition_point/1.cc @@ -0,0 +1,86 @@ +// { dg-options "-std=gnu++0x" } + +// 2008-06-28 Paolo Carlini + +// Copyright (C) 2008 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::forward_iterator_wrapper; + +typedef test_container Container; +int array[] = {0, 0, 1, 1, 1, 1}; + +bool +predicate(const int& i) +{ return i == 0; } + +void +test1() +{ + bool test __attribute__((unused)) = true; + + Container con(array, array); + + forward_iterator_wrapper mid = + std::partition_point(con.begin(), con.end(), predicate); + + VERIFY( std::all_of(con.begin(), mid, predicate) ); + VERIFY( std::none_of(mid, con.end(), predicate) ); +} + +void +test2() +{ + bool test __attribute__((unused)) = true; + + Container con(array, array + 1); + + forward_iterator_wrapper mid = + std::partition_point(con.begin(), con.end(), predicate); + + VERIFY( std::all_of(con.begin(), mid, predicate) ); + VERIFY( std::none_of(mid, con.end(), predicate) ); +} + +void +test3() +{ + bool test __attribute__((unused)) = true; + + Container con(array, array + 6); + + forward_iterator_wrapper mid = + std::partition_point(con.begin(), con.end(), predicate); + + VERIFY( std::all_of(con.begin(), mid, predicate) ); + VERIFY( std::none_of(mid, con.end(), predicate) ); +} + +int +main() +{ + test1(); + test2(); + test3(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_point/check_type.cc b/libstdc++-v3/testsuite/25_algorithms/partition_point/check_type.cc new file mode 100644 index 00000000000..4f49bdd7058 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partition_point/check_type.cc @@ -0,0 +1,50 @@ +// 2008-06-28 Paolo Carlini + +// Copyright (C) 2008 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// { dg-do compile } +// { dg-options "-std=gnu++0x" } + +#include +#include + +struct X { }; + +using __gnu_test::forward_iterator_wrapper; + +bool +pred_function(const X&) +{ return true; } + +struct pred_obj +{ + bool + operator()(const X&) + { return true; } +}; + +forward_iterator_wrapper +test1(forward_iterator_wrapper& begin, + forward_iterator_wrapper& end) +{ return std::partition_point(begin, end, pred_function); } + +forward_iterator_wrapper +test2(forward_iterator_wrapper& begin, + forward_iterator_wrapper& end) +{ return std::partition_point(begin, end, pred_obj()); } diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc b/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc new file mode 100644 index 00000000000..eceaa6a3174 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc @@ -0,0 +1,46 @@ +// { dg-do compile } +// { dg-options "-std=gnu++0x" } + +// 2008-06-28 Paolo Carlini + +// Copyright (C) 2008 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include +#include + +namespace std +{ + using __gnu_test::NonDefaultConstructible; + + typedef NonDefaultConstructible value_type; + typedef value_type* iterator_type; + typedef std::pointer_to_unary_function predicate_type; + + template iterator_type partition_point(iterator_type, iterator_type, predicate_type); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc b/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc new file mode 100644 index 00000000000..1940dbd80a4 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc @@ -0,0 +1,45 @@ +// { dg-do compile } +// { dg-options "-std=gnu++0x" } + +// 2008-06-28 Paolo Carlini + +// Copyright (C) 2008 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +#include +#include + +namespace std +{ + using __gnu_test::pod_int; + + typedef pod_int value_type; + typedef value_type* iterator_type; + typedef std::pointer_to_unary_function predicate_type; + + template iterator_type partition_point(iterator_type, iterator_type, predicate_type); +}