[libcxx-commits] [libcxx] 610979b - [libc++][ranges] Add ranges::in_out_out_result
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Feb 2 17:19:32 PST 2022
Author: Nikolas Klauser
Date: 2022-02-03T02:17:48+01:00
New Revision: 610979b301c5e90687a8528b6a685bf20cb643b3
URL: https://github.com/llvm/llvm-project/commit/610979b301c5e90687a8528b6a685bf20cb643b3
DIFF: https://github.com/llvm/llvm-project/commit/610979b301c5e90687a8528b6a685bf20cb643b3.diff
LOG: [libc++][ranges] Add ranges::in_out_out_result
Add `ranges::in_out_out_result`
Reviewed By: Quuxplusone, Mordante, #libc
Spies: libcxx-commits, mgorny
Differential Revision: https://reviews.llvm.org/D118634
Added:
libcxx/include/__algorithm/in_out_out_result.h
libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.module.verify.cpp
libcxx/test/std/algorithms/algorithms.results/in_out_out_result.pass.cpp
Modified:
libcxx/include/CMakeLists.txt
libcxx/include/algorithm
libcxx/include/module.modulemap
libcxx/test/std/algorithms/algorithms.results/in_in_out_result.pass.cpp
libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 7fdf2ff27b344..65fded9a430f1 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -28,6 +28,7 @@ set(files
__algorithm/half_positive.h
__algorithm/in_in_out_result.h
__algorithm/in_in_result.h
+ __algorithm/in_out_out_result.h
__algorithm/in_out_result.h
__algorithm/includes.h
__algorithm/inplace_merge.h
diff --git a/libcxx/include/__algorithm/in_out_out_result.h b/libcxx/include/__algorithm/in_out_out_result.h
new file mode 100644
index 0000000000000..222d4deec22d4
--- /dev/null
+++ b/libcxx/include/__algorithm/in_out_out_result.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
+#define _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
+
+#include <__concepts/convertible_to.h>
+#include <__config>
+#include <__utility/move.h>
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+#ifndef _LIBCPP_HAS_NO_CONCEPTS
+
+namespace ranges {
+template <class _I1, class _O1, class _O2>
+struct in_out_out_result {
+ [[no_unique_address]] _I1 in;
+ [[no_unique_address]] _O1 out1;
+ [[no_unique_address]] _O2 out2;
+
+ template <class _II1, class _OO1, class _OO2>
+ requires convertible_to<const _I1&, _II1> && convertible_to<const _O1&, _OO1> && convertible_to<const _O2&, _OO2>
+ _LIBCPP_HIDE_FROM_ABI constexpr
+ operator in_out_out_result<_II1, _OO1, _OO2>() const& {
+ return {in, out1, out2};
+ }
+
+ template <class _II1, class _OO1, class _OO2>
+ requires convertible_to<_I1, _II1> && convertible_to<_O1, _OO1> && convertible_to<_O2, _OO2>
+ _LIBCPP_HIDE_FROM_ABI constexpr
+ operator in_out_out_result<_II1, _OO1, _OO2>() && {
+ return {_VSTD::move(in), _VSTD::move(out1), _VSTD::move(out2)};
+ }
+};
+} // namespace ranges
+
+#endif // _LIBCPP_HAS_NO_CONCEPTS
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index e5f1030be2011..87e4ec9bad8ff 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -24,6 +24,9 @@ namespace ranges {
template <class I1, class I2, class O>
struct in_in_out_result; // since C++20
+
+ template <class I, class O1, class O2>
+ struct in_out_out_result; // since C++20
}
template <class InputIterator, class Predicate>
@@ -701,6 +704,7 @@ template<class InputIterator, class OutputIterator>
#include <__algorithm/half_positive.h>
#include <__algorithm/in_in_out_result.h>
#include <__algorithm/in_in_result.h>
+#include <__algorithm/in_out_out_result.h>
#include <__algorithm/in_out_result.h>
#include <__algorithm/includes.h>
#include <__algorithm/inplace_merge.h>
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index 84abf01bf5d75..adec0b7d86a87 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -248,6 +248,7 @@ module std [system] {
module half_positive { private header "__algorithm/half_positive.h" }
module in_in_out_result { private header "__algorithm/in_in_out_result.h" }
module in_in_result { private header "__algorithm/in_in_result.h" }
+ module in_out_out_result { private header "__algorithm/in_out_out_result.h" }
module in_out_result { private header "__algorithm/in_out_result.h" }
module includes { private header "__algorithm/includes.h" }
module inplace_merge { private header "__algorithm/inplace_merge.h" }
diff --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.module.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.module.verify.cpp
new file mode 100644
index 0000000000000..e1c0273d4c969
--- /dev/null
+++ b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.module.verify.cpp
@@ -0,0 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: modules-build
+
+// WARNING: This test was generated by 'generate_private_header_tests.py'
+// and should not be edited manually.
+
+// expected-error@*:* {{use of private header from outside its module: '__algorithm/in_out_out_result.h'}}
+#include <__algorithm/in_out_out_result.h>
diff --git a/libcxx/test/std/algorithms/algorithms.results/in_in_out_result.pass.cpp b/libcxx/test/std/algorithms/algorithms.results/in_in_out_result.pass.cpp
index 0dbe045141ffe..a7445d4801952 100644
--- a/libcxx/test/std/algorithms/algorithms.results/in_in_out_result.pass.cpp
+++ b/libcxx/test/std/algorithms/algorithms.results/in_in_out_result.pass.cpp
@@ -75,7 +75,7 @@ static_assert(!std::is_copy_constructible_v<std::ranges::in_in_out_result<int, i
constexpr bool test() {
{
- std::ranges::in_in_out_result<int, double, float> res{10L, 0., 1.f};
+ std::ranges::in_in_out_result<int, double, float> res{10, 0., 1.f};
assert(res.in1 == 10);
assert(res.in2 == 0.);
assert(res.out == 1.f);
diff --git a/libcxx/test/std/algorithms/algorithms.results/in_out_out_result.pass.cpp b/libcxx/test/std/algorithms/algorithms.results/in_out_out_result.pass.cpp
new file mode 100644
index 0000000000000..79d53b5a0ea27
--- /dev/null
+++ b/libcxx/test/std/algorithms/algorithms.results/in_out_out_result.pass.cpp
@@ -0,0 +1,108 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: libcpp-no-concepts
+// UNSUPPORTED: libcpp-has-no-incomplete-ranges
+
+// template <class I1, class O1, class O2>
+// struct in_out_out_result;
+
+#include <algorithm>
+#include <cassert>
+#include <type_traits>
+
+#include "MoveOnly.h"
+
+template <class T>
+struct ConvertibleFrom {
+ constexpr ConvertibleFrom(T c) : content{c} {}
+ T content;
+};
+
+struct A {
+ explicit A(int);
+};
+// conversion is not implicit
+static_assert(!std::is_constructible_v<std::ranges::in_out_out_result<A, A, A>,
+ std::ranges::in_out_out_result<int, int, int>>);
+
+struct B {
+ B(int);
+};
+static_assert(std::is_constructible_v<std::ranges::in_out_out_result<B, B, B>, std::ranges::in_out_out_result<int, int, int>>);
+static_assert(std::is_constructible_v<std::ranges::in_out_out_result<B, B, B>, std::ranges::in_out_out_result<int, int, int>&>);
+static_assert(std::is_constructible_v<std::ranges::in_out_out_result<B, B, B>, const std::ranges::in_out_out_result<int, int, int>>);
+static_assert(std::is_constructible_v<std::ranges::in_out_out_result<B, B, B>, const std::ranges::in_out_out_result<int, int, int>&>);
+
+struct C {
+ C(int&);
+};
+static_assert(!std::is_constructible_v<std::ranges::in_out_out_result<C, C, C>, std::ranges::in_out_out_result<int, int, int>&>);
+
+static_assert(std::is_convertible_v<std::ranges::in_out_out_result<int, int, int>&,
+ std::ranges::in_out_out_result<long, long, long>>);
+static_assert(std::is_convertible_v<const std::ranges::in_out_out_result<int, int, int>&,
+ std::ranges::in_out_out_result<long, long, long>>);
+static_assert(std::is_convertible_v<std::ranges::in_out_out_result<int, int, int>&&,
+ std::ranges::in_out_out_result<long, long, long>>);
+static_assert(std::is_convertible_v<const std::ranges::in_out_out_result<int, int, int>&&,
+ std::ranges::in_out_out_result<long, long, long>>);
+
+struct NotConvertible {};
+static_assert(!std::is_convertible_v<std::ranges::in_out_out_result<NotConvertible, int, int>,
+ std::ranges::in_out_out_result<int, int, int>>);
+static_assert(!std::is_convertible_v<std::ranges::in_out_out_result<int, NotConvertible, int>,
+ std::ranges::in_out_out_result<int, int, int>>);
+static_assert(!std::is_convertible_v<std::ranges::in_out_out_result<int, int, NotConvertible>,
+ std::ranges::in_out_out_result<int, int, int>>);
+
+static_assert(std::is_constructible_v<std::ranges::in_out_out_result<MoveOnly, MoveOnly, MoveOnly>,
+ std::ranges::in_out_out_result<int, int, int>&>);
+
+static_assert(std::is_move_constructible_v<std::ranges::in_out_out_result<MoveOnly, int, int>>);
+static_assert(std::is_move_constructible_v<std::ranges::in_out_out_result<int, MoveOnly, int>>);
+static_assert(std::is_move_constructible_v<std::ranges::in_out_out_result<int, int, MoveOnly>>);
+
+static_assert(!std::is_copy_constructible_v<std::ranges::in_out_out_result<MoveOnly, int, int>>);
+static_assert(!std::is_copy_constructible_v<std::ranges::in_out_out_result<int, MoveOnly, int>>);
+static_assert(!std::is_copy_constructible_v<std::ranges::in_out_out_result<int, int, MoveOnly>>);
+
+constexpr bool test() {
+ {
+ std::ranges::in_out_out_result<int, double, float> res{10, 0., 1.f};
+ assert(res.in == 10);
+ assert(res.out1 == 0.);
+ assert(res.out2 == 1.f);
+ std::ranges::in_out_out_result<ConvertibleFrom<int>, ConvertibleFrom<double>, ConvertibleFrom<float>> res2 = res;
+ assert(res2.in.content == 10);
+ assert(res2.out1.content == 0.);
+ assert(res2.out2.content == 1.f);
+ }
+ {
+ std::ranges::in_out_out_result<MoveOnly, int, int> res1{MoveOnly{}, 0, 0};
+ assert(res1.in.get() == 1);
+ auto res2 = static_cast<std::ranges::in_out_out_result<MoveOnly, int, int>>(std::move(res1));
+ assert(res1.in.get() == 0);
+ assert(res2.in.get() == 1);
+ }
+ {
+ auto [in, out1, out2] = std::ranges::in_out_out_result<int, int, int>{1, 2, 3};
+ assert(in == 1);
+ assert(out1 == 2);
+ assert(out2 == 3);
+ }
+ return true;
+}
+
+int main(int, char**) {
+ test();
+ static_assert(test());
+
+ return 0;
+}
diff --git a/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp b/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp
index ab6a5b30b41af..f7e761022f344 100644
--- a/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp
+++ b/libcxx/test/std/algorithms/algorithms.results/no_unique_address.compile.pass.cpp
@@ -35,3 +35,12 @@ static_assert(sizeof(std::ranges::in_in_out_result<Empty, char, Empty>) == 2);
static_assert(sizeof(std::ranges::in_in_out_result<Empty, Empty, char>) == 2);
static_assert(sizeof(std::ranges::in_in_out_result<int, Empty, Empty2>) == sizeof(int));
static_assert(sizeof(std::ranges::in_in_out_result<Empty, Empty, Empty>) == 3);
+
+static_assert(sizeof(std::ranges::in_out_out_result<Empty, int, int>) == 2 * sizeof(int));
+static_assert(sizeof(std::ranges::in_out_out_result<int, Empty, int>) == 2 * sizeof(int));
+static_assert(sizeof(std::ranges::in_out_out_result<int, int, Empty>) == 2 * sizeof(int));
+static_assert(sizeof(std::ranges::in_out_out_result<char, Empty, Empty>) == 2);
+static_assert(sizeof(std::ranges::in_out_out_result<Empty, char, Empty>) == 2);
+static_assert(sizeof(std::ranges::in_out_out_result<Empty, Empty, char>) == 2);
+static_assert(sizeof(std::ranges::in_out_out_result<int, Empty, Empty2>) == sizeof(int));
+static_assert(sizeof(std::ranges::in_out_out_result<Empty, Empty, Empty>) == 3);
More information about the libcxx-commits
mailing list