system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 10:05:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Rewrite {AnyOf,AllOf,Find}.h to use the IteratorPairWith concept

Browse source 
This makes it so these algorithms are usable with arbitrary iterators,
as opposed to just instances of AK::SimpleIterator.
This commit also makes the requirement of ::index() in find_index()
explicit, as previously it was accepting any iterator.
This commit is contained in:
Ali Mohammad Pur 2021-07-22 19:19:34 +04:30 committed by Andreas Kling
parent 2dc31c503e
commit 73fc2b3748
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AK/AllOf.h
View file

@ -11,10 +11,10 @@
namespace AK {
template<typename Container, typename ValueType>
template<typename TEndIterator, IteratorPairWith<TEndIterator> TIterator>
constexpr bool all_of(
SimpleIterator<Container, ValueType> const& begin,
SimpleIterator<Container, ValueType> const& end,
TIterator const& begin,
TEndIterator const& end,
auto const& predicate)
{
for (auto iter = begin; iter != end; ++iter) {

6
AK/AnyOf.h
View file

@ -12,10 +12,10 @@
namespace AK {
template<typename Container, typename ValueType>
template<typename TEndIterator, IteratorPairWith<TEndIterator> TIterator>
constexpr bool any_of(
SimpleIterator<Container, ValueType> const& begin,
SimpleIterator<Container, ValueType> const& end,
TIterator const& begin,
TEndIterator const& end,
auto const& predicate)
{
return find_if(begin, end, predicate) != end;

17
AK/Find.h
View file

@ -6,13 +6,14 @@
#pragma once
#include <AK/Concepts.h>
#include <AK/Traits.h>
#include <AK/Types.h>
namespace AK {
template<typename TIterator, typename TUnaryPredicate>
constexpr TIterator find_if(TIterator first, TIterator last, TUnaryPredicate&& pred)
template<typename TEndIterator, IteratorPairWith<TEndIterator> TIterator, typename TUnaryPredicate>
constexpr TIterator find_if(TIterator first, TEndIterator last, TUnaryPredicate&& pred)
{
for (; first != last; ++first) {
if (pred(*first)) {
@ -22,16 +23,16 @@ constexpr TIterator find_if(TIterator first, TIterator last, TUnaryPredicate&& p
return last;
}
template<typename TIterator, typename T>
constexpr TIterator find(TIterator first, TIterator last, const T& value)
template<typename TEndIterator, IteratorPairWith<TEndIterator> TIterator, typename T>
constexpr TIterator find(TIterator first, TEndIterator last, T const& value)
{
return find_if(first, last, [&](const auto& v) { return Traits<T>::equals(value, v); });
return find_if(first, last, [&](auto const& v) { return Traits<T>::equals(value, v); });
}
template<typename TIterator, typename T>
constexpr size_t find_index(TIterator first, TIterator last, const T& value)
template<typename TEndIterator, IteratorPairWith<TEndIterator> TIterator, typename T>
constexpr size_t find_index(TIterator first, TEndIterator last, T const& value) requires(requires(TIterator it) { it.index(); })
{
return find_if(first, last, [&](const auto& v) { return Traits<T>::equals(value, v); }).index();
return find_if(first, last, [&](auto const& v) { return Traits<T>::equals(value, v); }).index();
}
}