[PATCH] D131829: [ADT] Implement Optional::transform
Kazu Hirata via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 12 23:00:31 PDT 2022
kazu created this revision.
Herald added a project: All.
kazu requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
This patch implements Optional::transform for consistency with
std::optional::transform in C++23.
Note that the new function is identical to Optional::map. My plan is
to deprecate Optional::map after migrating all of its uses to
Optional::transform.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D131829
Files:
llvm/include/llvm/ADT/Optional.h
llvm/unittests/ADT/OptionalTest.cpp
Index: llvm/unittests/ADT/OptionalTest.cpp
===================================================================
--- llvm/unittests/ADT/OptionalTest.cpp
+++ llvm/unittests/ADT/OptionalTest.cpp
@@ -603,6 +603,40 @@
EXPECT_EQ(2u, MoveOnly::Destructions);
}
+TEST(OptionalTest, Transform) {
+ Optional<int> A;
+
+ Optional<int> B = A.transform([&](int N) { return N + 1; });
+ EXPECT_FALSE(B.has_value());
+
+ A = 3;
+ Optional<int> C = A.transform([&](int N) { return N + 1; });
+ EXPECT_TRUE(C.has_value());
+ EXPECT_EQ(4, C.value());
+}
+
+TEST(OptionalTest, MoveTransform) {
+ Optional<MoveOnly> A;
+
+ MoveOnly::ResetCounts();
+ Optional<int> B =
+ std::move(A).transform([&](const MoveOnly &M) { return M.val + 2; });
+ EXPECT_FALSE(B.has_value());
+ EXPECT_EQ(0u, MoveOnly::MoveConstructions);
+ EXPECT_EQ(0u, MoveOnly::MoveAssignments);
+ EXPECT_EQ(0u, MoveOnly::Destructions);
+
+ A = MoveOnly(5);
+ MoveOnly::ResetCounts();
+ Optional<int> C =
+ std::move(A).transform([&](const MoveOnly &M) { return M.val + 2; });
+ EXPECT_TRUE(C.has_value());
+ EXPECT_EQ(7, C.value());
+ EXPECT_EQ(0u, MoveOnly::MoveConstructions);
+ EXPECT_EQ(0u, MoveOnly::MoveAssignments);
+ EXPECT_EQ(0u, MoveOnly::Destructions);
+}
+
struct EqualTo {
template <typename T, typename U> static bool apply(const T &X, const U &Y) {
return X == Y;
Index: llvm/include/llvm/ADT/Optional.h
===================================================================
--- llvm/include/llvm/ADT/Optional.h
+++ llvm/include/llvm/ADT/Optional.h
@@ -342,6 +342,12 @@
/// Apply a function to the value if present; otherwise return None.
template <class Function>
+ auto transform(const Function &F) const & -> Optional<decltype(F(value()))> {
+ if (*this)
+ return F(value());
+ return None;
+ }
+ template <class Function>
auto map(const Function &F) const & -> Optional<decltype(F(value()))> {
if (*this)
return F(value());
@@ -365,6 +371,13 @@
/// Apply a function to the value if present; otherwise return None.
template <class Function>
+ auto transform(
+ const Function &F) && -> Optional<decltype(F(std::move(*this).value()))> {
+ if (*this)
+ return F(std::move(*this).value());
+ return None;
+ }
+ template <class Function>
auto map(const Function &F)
&& -> Optional<decltype(F(std::move(*this).value()))> {
if (*this)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D131829.452386.patch
Type: text/x-patch
Size: 2415 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220813/ff4034da/attachment.bin>
More information about the llvm-commits
mailing list