[v3] Add std::partition_point

[Paolo Carlini <paolo.carlini@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 90 bytes --]

Hi,

tested x86_64-linux, committed to mainline.

Paolo.

///////////////////////////////

[-- Attachment #2: CL_partition_point.txt --]
[-- Type: text/plain, Size: 541 bytes --]

2008-06-28  Paolo Carlini  <paolo.carlini@oracle.com>

	* 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.

[-- Attachment #3: patch_partition_point.txt --]
[-- Type: text/plain, Size: 11938 bytes --]

Index: include/bits/stl_algo.h
===================================================================
--- include/bits/stl_algo.h	(revision 137231)
+++ include/bits/stl_algo.h	(working copy)
@@ -817,6 +817,51 @@
       __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<typename _ForwardIterator, typename _Predicate>
+    _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
 
 
Index: include/bits/algorithmfwd.h
===================================================================
--- include/bits/algorithmfwd.h	(revision 137231)
+++ include/bits/algorithmfwd.h	(working copy)
@@ -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 @@
 	   typename _OIter2, typename _Predicate>
     pair<_OIter1, _OIter2>
     partition_copy(_IIter, _IIter, _OIter1, _OIter2, _Predicate);
+
+  template<typename _FIter, typename _Predicate>
+    _FIter
+    partition_point(_FIter, _FIter, _Predicate);
 #endif
 
   template<typename _RAIter>
Index: testsuite/25_algorithms/partition_point/check_type.cc
===================================================================
--- testsuite/25_algorithms/partition_point/check_type.cc	(revision 0)
+++ testsuite/25_algorithms/partition_point/check_type.cc	(revision 0)
@@ -0,0 +1,50 @@
+// 2008-06-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// 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 <algorithm>
+#include <testsuite_iterators.h>
+
+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<X>
+test1(forward_iterator_wrapper<X>& begin,
+      forward_iterator_wrapper<X>& end)
+{ return std::partition_point(begin, end, pred_function); }
+
+forward_iterator_wrapper<X>
+test2(forward_iterator_wrapper<X>& begin,
+      forward_iterator_wrapper<X>& end)
+{ return std::partition_point(begin, end, pred_obj()); }
Index: testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc
===================================================================
--- testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc	(revision 0)
+++ testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc	(revision 0)
@@ -0,0 +1,46 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+// 2008-06-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// 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 <algorithm>
+#include <functional>
+#include <testsuite_api.h>
+
+namespace std
+{
+  using __gnu_test::NonDefaultConstructible;
+
+  typedef NonDefaultConstructible 		value_type;
+  typedef value_type* 		iterator_type;
+  typedef std::pointer_to_unary_function<value_type, bool> predicate_type;
+
+  template iterator_type partition_point(iterator_type, iterator_type, predicate_type);
+} 
Index: testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc
===================================================================
--- testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc	(revision 0)
+++ testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc	(revision 0)
@@ -0,0 +1,45 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+// 2008-06-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// 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 <algorithm>
+#include <testsuite_character.h>
+
+namespace std
+{
+  using __gnu_test::pod_int;
+
+  typedef pod_int 		value_type;
+  typedef value_type* 		iterator_type;
+  typedef std::pointer_to_unary_function<value_type, bool> predicate_type;
+
+  template iterator_type partition_point(iterator_type, iterator_type, predicate_type);
+} 
Index: testsuite/25_algorithms/partition_point/1.cc
===================================================================
--- testsuite/25_algorithms/partition_point/1.cc	(revision 0)
+++ testsuite/25_algorithms/partition_point/1.cc	(revision 0)
@@ -0,0 +1,86 @@
+// { dg-options "-std=gnu++0x" }
+
+// 2008-06-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// 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 <algorithm>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+
+using __gnu_test::test_container;
+using __gnu_test::forward_iterator_wrapper;
+
+typedef test_container<int, forward_iterator_wrapper> 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<int> 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<int> 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<int> 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;
+}
Index: testsuite/25_algorithms/headers/algorithm/synopsis.cc
===================================================================
--- testsuite/25_algorithms/headers/algorithm/synopsis.cc	(revision 137231)
+++ testsuite/25_algorithms/headers/algorithm/synopsis.cc	(working copy)
@@ -55,6 +55,10 @@
   template<typename _IIter, typename _Predicate>
     bool
     is_partitioned(_IIter, _IIter, _Predicate);
+
+  template<typename _FIter, typename _Predicate>
+    _FIter
+    partition_point(_FIter, _FIter, _Predicate);
 #endif
 
   template<typename _FIter1, typename _FIter2>