mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-22 17:31:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Vector: Homogenize type and parameter names for predicates

Browse source
This commit is contained in:
ngc6302h 2021-07-12 23:17:25 +02:00 committed by Andreas Kling
parent 334499a3f4
commit de7831153f
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
AK/Vector.h
View file

@ -163,22 +163,22 @@ public:
T const& last() const { return at(size() - 1); }
T& last() { return at(size() - 1); }
template<typename Callback>
Optional<T> first_matching(Callback callback)
template<typename TUnaryPredicate>
Optional<T> first_matching(TUnaryPredicate predicate)
{
for (size_t i = 0; i < size(); ++i) {
if (callback(at(i))) {
if (predicate(at(i))) {
return at(i);
}
}
return {};
}
template<typename Callback>
Optional<T> last_matching(Callback callback)
template<typename TUnaryPredicate>
Optional<T> last_matching(TUnaryPredicate predicate)
{
for (ssize_t i = size() - 1; i >= 0; --i) {
if (callback(at(i))) {
if (predicate(at(i))) {
return at(i);
}
}
@ -220,10 +220,10 @@ public:
VERIFY(did_allocate);
}
template<typename C, typename U = T>
void insert_before_matching(U&& value, C callback, size_t first_index = 0, size_t* inserted_index = nullptr) requires(CanBePlacedInsideVector<U>)
template<typename TUnaryPredicate, typename U = T>
void insert_before_matching(U&& value, TUnaryPredicate predicate, size_t first_index = 0, size_t* inserted_index = nullptr) requires(CanBePlacedInsideVector<U>)
{
auto did_allocate = try_insert_before_matching(forward<U>(value), callback, first_index, inserted_index);
auto did_allocate = try_insert_before_matching(forward<U>(value), predicate, first_index, inserted_index);
VERIFY(did_allocate);
}
@ -397,11 +397,11 @@ public:
m_size -= count;
}
template<typename Callback>
bool remove_first_matching(Callback callback)
template<typename TUnaryPredicate>
bool remove_first_matching(TUnaryPredicate predicate)
{
for (size_t i = 0; i < size(); ++i) {
if (callback(at(i))) {
if (predicate(at(i))) {
remove(i);
return true;
}
@ -409,11 +409,11 @@ public:
return false;
}
template<typename Callback>
void remove_all_matching(Callback callback)
template<typename TUnaryPredicate>
void remove_all_matching(TUnaryPredicate predicate)
{
for (size_t i = 0; i < size();) {
if (callback(at(i))) {
if (predicate(at(i))) {
remove(i);
} else {
++i;
@ -487,11 +487,11 @@ public:
return true;
}
template<typename C, typename U = T>
[[nodiscard]] bool try_insert_before_matching(U&& value, C callback, size_t first_index = 0, size_t* inserted_index = nullptr) requires(CanBePlacedInsideVector<U>)
template<typename TUnaryPredicate, typename U = T>
[[nodiscard]] bool try_insert_before_matching(U&& value, TUnaryPredicate predicate, size_t first_index = 0, size_t* inserted_index = nullptr) requires(CanBePlacedInsideVector<U>)
{
for (size_t i = first_index; i < size(); ++i) {
if (callback(at(i))) {
if (predicate(at(i))) {
if (!try_insert(i, forward<U>(value)))
return false;
if (inserted_index)