beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

AK: Make StringView::for_each_split_view() aware of IterationDecision

Browse source
This commit is contained in:
Hendiadyoin1 2024-02-22 16:26:37 +01:00 committed by Andrew Kaster
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
Show stats Download patch file Download diff file Expand all files Collapse all files

30
AK/StringView.h
View file

@ -8,6 +8,7 @@
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/Checked.h> #include <AK/Checked.h>
#include <AK/Concepts.h>
#include <AK/EnumBits.h> #include <AK/EnumBits.h>
#include <AK/Forward.h> #include <AK/Forward.h>
#include <AK/Optional.h> #include <AK/Optional.h>
@ -176,8 +177,14 @@ public:
{ {
VERIFY(!separator.is_empty()); VERIFY(!separator.is_empty());
// FIXME: This can't go in the template header since declval won't allow the incomplete StringView type. // FIXME: This can't go in the template header since declval won't allow the incomplete StringView type.
using CallbackReturn = decltype(declval<Callback>()(StringView {})); using CallbackReturn = InvokeResult<Callback, StringView>;
constexpr auto ReturnsErrorOr = IsSpecializationOf<CallbackReturn, ErrorOr>; 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>; using ReturnType = Conditional<ReturnsErrorOr, ErrorOr<void>, void>;
return [&]() -> ReturnType { return [&]() -> ReturnType {
if (is_empty()) if (is_empty())
@ -194,10 +201,21 @@ public:
auto part = part_with_separator; auto part = part_with_separator;
if (!keep_separator) if (!keep_separator)
part = part_with_separator.substring_view(0, separator_index); part = part_with_separator.substring_view(0, separator_index);
if constexpr (ReturnsErrorOr) if constexpr (ReturnsErrorOr) {
TRY(callback(part)); if constexpr (ReturnsIterationDecision) {
else if (TRY(callback(part)) == IterationDecision::Break)
callback(part); 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); view = view.substring_view_starting_after_substring(part_with_separator);
maybe_separator_index = view.find(separator); maybe_separator_index = view.find(separator);