[libcxx-commits] [libcxx] d03aa7d - [libc++] NFCI: Remove __functional/search.h
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Jun 29 08:41:00 PDT 2021
Author: Louis Dionne
Date: 2021-06-29T11:40:47-04:00
New Revision: d03aa7d6b66fd741db2d937c18a6c6675037b888
URL: https://github.com/llvm/llvm-project/commit/d03aa7d6b66fd741db2d937c18a6c6675037b888
DIFF: https://github.com/llvm/llvm-project/commit/d03aa7d6b66fd741db2d937c18a6c6675037b888.diff
LOG: [libc++] NFCI: Remove __functional/search.h
The __search helper function was once split into __functional for circular
dependency reasons, however this is not an issue anymore now that we have
finer grained headers.
Added:
Modified:
libcxx/include/CMakeLists.txt
libcxx/include/__algorithm/search.h
libcxx/include/experimental/functional
libcxx/include/functional
libcxx/include/module.modulemap
libcxx/include/regex
Removed:
libcxx/include/__functional/search.h
################################################################################
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 3b03ec668578..ec1e0762c661 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -107,7 +107,6 @@ set(files
__functional_base
__functional_base_03
__functional/hash.h
- __functional/search.h
__functional/unary_function.h
__functional/unwrap_ref.h
__hash_table
diff --git a/libcxx/include/__algorithm/search.h b/libcxx/include/__algorithm/search.h
index 1b238fcab3e9..008b8ebb04ad 100644
--- a/libcxx/include/__algorithm/search.h
+++ b/libcxx/include/__algorithm/search.h
@@ -10,11 +10,11 @@
#ifndef _LIBCPP___ALGORITHM_SEARCH_H
#define _LIBCPP___ALGORITHM_SEARCH_H
-#include <__config>
#include <__algorithm/comp.h>
-#include <__functional/search.h>
+#include <__config>
#include <__iterator/iterator_traits.h>
#include <type_traits>
+#include <utility>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
@@ -25,6 +25,78 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_BEGIN_NAMESPACE_STD
+template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
+pair<_ForwardIterator1, _ForwardIterator1>
+ _LIBCPP_CONSTEXPR_AFTER_CXX11 __search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
+ _ForwardIterator2 __first2, _ForwardIterator2 __last2,
+ _BinaryPredicate __pred, forward_iterator_tag, forward_iterator_tag) {
+ if (__first2 == __last2)
+ return _VSTD::make_pair(__first1, __first1); // Everything matches an empty sequence
+ while (true) {
+ // Find first element in sequence 1 that matchs *__first2, with a mininum of loop checks
+ while (true) {
+ if (__first1 == __last1) // return __last1 if no element matches *__first2
+ return _VSTD::make_pair(__last1, __last1);
+ if (__pred(*__first1, *__first2))
+ break;
+ ++__first1;
+ }
+ // *__first1 matches *__first2, now match elements after here
+ _ForwardIterator1 __m1 = __first1;
+ _ForwardIterator2 __m2 = __first2;
+ while (true) {
+ if (++__m2 == __last2) // If pattern exhausted, __first1 is the answer (works for 1 element pattern)
+ return _VSTD::make_pair(__first1, __m1);
+ if (++__m1 == __last1) // Otherwise if source exhaused, pattern not found
+ return _VSTD::make_pair(__last1, __last1);
+ if (!__pred(*__m1, *__m2)) // if there is a mismatch, restart with a new __first1
+ {
+ ++__first1;
+ break;
+ } // else there is a match, check next elements
+ }
+ }
+}
+
+template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
+_LIBCPP_CONSTEXPR_AFTER_CXX11 pair<_RandomAccessIterator1, _RandomAccessIterator1>
+__search(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
+ _RandomAccessIterator2 __last2, _BinaryPredicate __pred, random_access_iterator_tag,
+ random_access_iterator_tag) {
+ typedef typename iterator_traits<_RandomAccessIterator1>::
diff erence_type _D1;
+ typedef typename iterator_traits<_RandomAccessIterator2>::
diff erence_type _D2;
+ // Take advantage of knowing source and pattern lengths. Stop short when source is smaller than pattern
+ const _D2 __len2 = __last2 - __first2;
+ if (__len2 == 0)
+ return _VSTD::make_pair(__first1, __first1);
+ const _D1 __len1 = __last1 - __first1;
+ if (__len1 < __len2)
+ return _VSTD::make_pair(__last1, __last1);
+ const _RandomAccessIterator1 __s = __last1 - (__len2 - 1); // Start of pattern match can't go beyond here
+
+ while (true) {
+ while (true) {
+ if (__first1 == __s)
+ return _VSTD::make_pair(__last1, __last1);
+ if (__pred(*__first1, *__first2))
+ break;
+ ++__first1;
+ }
+
+ _RandomAccessIterator1 __m1 = __first1;
+ _RandomAccessIterator2 __m2 = __first2;
+ while (true) {
+ if (++__m2 == __last2)
+ return _VSTD::make_pair(__first1, __first1 + __len2);
+ ++__m1; // no need to check range on __m1 because __s guarantees we have enough source
+ if (!__pred(*__m1, *__m2)) {
+ ++__first1;
+ break;
+ }
+ }
+ }
+}
+
template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
_LIBCPP_NODISCARD_EXT inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator1
search(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2,
diff --git a/libcxx/include/__functional/search.h b/libcxx/include/__functional/search.h
deleted file mode 100644
index 061b30f0d032..000000000000
--- a/libcxx/include/__functional/search.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___FUNCTIONAL___SEARCH_H
-#define _LIBCPP___FUNCTIONAL___SEARCH_H
-
-#include <__config>
-#include <__iterator/iterator_traits.h>
-#include <utility>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_PUSH_MACROS
-#include <__undef_macros>
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-pair<_ForwardIterator1, _ForwardIterator1>
- _LIBCPP_CONSTEXPR_AFTER_CXX11 __search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
- _ForwardIterator2 __first2, _ForwardIterator2 __last2,
- _BinaryPredicate __pred, forward_iterator_tag, forward_iterator_tag) {
- if (__first2 == __last2)
- return _VSTD::make_pair(__first1, __first1); // Everything matches an empty sequence
- while (true) {
- // Find first element in sequence 1 that matchs *__first2, with a mininum of loop checks
- while (true) {
- if (__first1 == __last1) // return __last1 if no element matches *__first2
- return _VSTD::make_pair(__last1, __last1);
- if (__pred(*__first1, *__first2))
- break;
- ++__first1;
- }
- // *__first1 matches *__first2, now match elements after here
- _ForwardIterator1 __m1 = __first1;
- _ForwardIterator2 __m2 = __first2;
- while (true) {
- if (++__m2 == __last2) // If pattern exhausted, __first1 is the answer (works for 1 element pattern)
- return _VSTD::make_pair(__first1, __m1);
- if (++__m1 == __last1) // Otherwise if source exhaused, pattern not found
- return _VSTD::make_pair(__last1, __last1);
- if (!__pred(*__m1, *__m2)) // if there is a mismatch, restart with a new __first1
- {
- ++__first1;
- break;
- } // else there is a match, check next elements
- }
- }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 pair<_RandomAccessIterator1, _RandomAccessIterator1>
-__search(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
- _RandomAccessIterator2 __last2, _BinaryPredicate __pred, random_access_iterator_tag,
- random_access_iterator_tag) {
- typedef typename iterator_traits<_RandomAccessIterator1>::
diff erence_type _D1;
- typedef typename iterator_traits<_RandomAccessIterator2>::
diff erence_type _D2;
- // Take advantage of knowing source and pattern lengths. Stop short when source is smaller than pattern
- const _D2 __len2 = __last2 - __first2;
- if (__len2 == 0)
- return _VSTD::make_pair(__first1, __first1);
- const _D1 __len1 = __last1 - __first1;
- if (__len1 < __len2)
- return _VSTD::make_pair(__last1, __last1);
- const _RandomAccessIterator1 __s = __last1 - (__len2 - 1); // Start of pattern match can't go beyond here
-
- while (true) {
- while (true) {
- if (__first1 == __s)
- return _VSTD::make_pair(__last1, __last1);
- if (__pred(*__first1, *__first2))
- break;
- ++__first1;
- }
-
- _RandomAccessIterator1 __m1 = __first1;
- _RandomAccessIterator2 __m2 = __first2;
- while (true) {
- if (++__m2 == __last2)
- return _VSTD::make_pair(__first1, __first1 + __len2);
- ++__m1; // no need to check range on __m1 because __s guarantees we have enough source
- if (!__pred(*__m1, *__m2)) {
- ++__first1;
- break;
- }
- }
- }
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-_LIBCPP_POP_MACROS
-
-#endif // _LIBCPP___FUNCTIONAL___SEARCH_H
diff --git a/libcxx/include/experimental/functional b/libcxx/include/experimental/functional
index f6c1821da9c5..e18962002d4a 100644
--- a/libcxx/include/experimental/functional
+++ b/libcxx/include/experimental/functional
@@ -86,7 +86,6 @@ inline namespace fundamentals_v1 {
*/
-#include <__functional/search.h>
#include <experimental/__config>
#include <functional>
#include <algorithm>
diff --git a/libcxx/include/functional b/libcxx/include/functional
index 2b2dcd26ce46..976b94585b0b 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -487,11 +487,11 @@ POLICY: For non-variadic implementations, the number of arguments is limited
*/
+#include <__algorithm/search.h>
#include <__config>
#include <__debug>
#include <__functional_base>
#include <__functional/hash.h>
-#include <__functional/search.h>
#include <__functional/unary_function.h>
#include <__functional/unwrap_ref.h>
#include <__utility/forward.h>
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index da0a988c00c8..9c6c678affbb 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -409,7 +409,6 @@ module std [system] {
export *
module __functional {
module hash { header "__functional/hash.h" }
- module search { header "__functional/search.h" }
module unary_function { header "__functional/unary_function.h" }
module unwrap_ref { header "__functional/unwrap_ref.h" }
}
diff --git a/libcxx/include/regex b/libcxx/include/regex
index 9e5c6ed39998..55f1d34b51f5 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -764,7 +764,6 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
#include <__config>
#include <__debug>
-#include <__functional/search.h>
#include <__iterator/wrap_iter.h>
#include <__locale>
#include <compare>
More information about the libcxx-commits
mailing list