mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-21 23:20:20 +00:00
AK: Make StringView::for_each_split_view() aware of IterationDecision
This commit is contained in:
parent
1fc0c84017
commit
38cb5444d9
Notes:
sideshowbarker
2024-07-17 18:23:22 +09:00
Author: https://github.com/Hendiadyoin1 Commit: https://github.com/SerenityOS/serenity/commit/38cb5444d9 Pull-request: https://github.com/SerenityOS/serenity/pull/22948 Reviewed-by: https://github.com/ADKaster Reviewed-by: https://github.com/kleinesfilmroellchen Reviewed-by: https://github.com/spholz
1 changed files with 24 additions and 6 deletions
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <AK/Assertions.h>
|
||||
#include <AK/Checked.h>
|
||||
#include <AK/Concepts.h>
|
||||
#include <AK/EnumBits.h>
|
||||
#include <AK/Forward.h>
|
||||
#include <AK/Optional.h>
|
||||
|
@ -176,8 +177,14 @@ public:
|
|||
{
|
||||
VERIFY(!separator.is_empty());
|
||||
// FIXME: This can't go in the template header since declval won't allow the incomplete StringView type.
|
||||
using CallbackReturn = decltype(declval<Callback>()(StringView {}));
|
||||
constexpr auto ReturnsErrorOr = IsSpecializationOf<CallbackReturn, ErrorOr>;
|
||||
using CallbackReturn = InvokeResult<Callback, StringView>;
|
||||
constexpr auto ReturnsErrorOr = FallibleFunction<Callback, StringView>;
|
||||
// FIXME: We might need a concept for this...
|
||||
constexpr auto ReturnsIterationDecision = []() -> bool {
|
||||
if constexpr (ReturnsErrorOr)
|
||||
return IsSame<typename CallbackReturn::ResultType, IterationDecision>;
|
||||
return IsSame<CallbackReturn, IterationDecision>;
|
||||
}();
|
||||
using ReturnType = Conditional<ReturnsErrorOr, ErrorOr<void>, void>;
|
||||
return [&]() -> ReturnType {
|
||||
if (is_empty())
|
||||
|
@ -194,10 +201,21 @@ public:
|
|||
auto part = part_with_separator;
|
||||
if (!keep_separator)
|
||||
part = part_with_separator.substring_view(0, separator_index);
|
||||
if constexpr (ReturnsErrorOr)
|
||||
TRY(callback(part));
|
||||
else
|
||||
callback(part);
|
||||
if constexpr (ReturnsErrorOr) {
|
||||
if constexpr (ReturnsIterationDecision) {
|
||||
if (TRY(callback(part)) == IterationDecision::Break)
|
||||
return ReturnType();
|
||||
} else {
|
||||
TRY(callback(part));
|
||||
}
|
||||
} else {
|
||||
if constexpr (ReturnsIterationDecision) {
|
||||
if (callback(part) == IterationDecision::Break)
|
||||
return ReturnType();
|
||||
} else {
|
||||
callback(part);
|
||||
}
|
||||
}
|
||||
}
|
||||
view = view.substring_view_starting_after_substring(part_with_separator);
|
||||
maybe_separator_index = view.find(separator);
|
||||
|
|
Loading…
Reference in a new issue