forked from OSchip/llvm-project
[libc++][ranges] Add ranges::in_found_result
Reviewed By: Quuxplusone, #libc Spies: libcxx-commits, mgorny Differential Revision: https://reviews.llvm.org/D119763
This commit is contained in:
parent
c7b43b01dc
commit
68f4131c94
|
@ -26,6 +26,7 @@ set(files
|
|||
__algorithm/generate.h
|
||||
__algorithm/generate_n.h
|
||||
__algorithm/half_positive.h
|
||||
__algorithm/in_found_result.h
|
||||
__algorithm/in_fun_result.h
|
||||
__algorithm/in_in_out_result.h
|
||||
__algorithm/in_in_result.h
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
// -*- 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_FOUND_RESULT_H
|
||||
#define _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
|
||||
|
||||
#include <__concepts/convertible_to.h>
|
||||
#include <__config>
|
||||
#include <__utility/move.h>
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||
# pragma GCC system_header
|
||||
#endif
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
|
||||
|
||||
_LIBCPP_BEGIN_NAMESPACE_STD
|
||||
|
||||
namespace ranges {
|
||||
template <class _I1>
|
||||
struct in_found_result {
|
||||
_LIBCPP_NO_UNIQUE_ADDRESS _I1 in;
|
||||
bool found;
|
||||
|
||||
template <class _I2>
|
||||
requires convertible_to<const _I1&, _I2>
|
||||
_LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_I2>() const & {
|
||||
return {in, found};
|
||||
}
|
||||
|
||||
template <class _I2>
|
||||
requires convertible_to<_I1, _I2>
|
||||
_LIBCPP_HIDE_FROM_ABI constexpr operator in_found_result<_I2>() && {
|
||||
return {std::move(in), found};
|
||||
}
|
||||
};
|
||||
} // namespace ranges
|
||||
|
||||
_LIBCPP_END_NAMESPACE_STD
|
||||
|
||||
#endif // _LIBCPP_HAS_NO_CONCEPTS
|
||||
|
||||
#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
|
|
@ -34,6 +34,9 @@ namespace ranges {
|
|||
template <class I1, class I2>
|
||||
struct min_max_result; // since C++20
|
||||
|
||||
template <class I>
|
||||
struct in_found_result; // since C++20
|
||||
|
||||
template<forward_iterator I, sentinel_for<I> S, class Proj = identity,
|
||||
indirect_strict_weak_order<projected<I, Proj>> Comp = ranges::less> // since C++20
|
||||
constexpr I min_element(I first, S last, Comp comp = {}, Proj proj = {});
|
||||
|
@ -719,6 +722,7 @@ template <class BidirectionalIterator, class Compare>
|
|||
#include <__algorithm/generate.h>
|
||||
#include <__algorithm/generate_n.h>
|
||||
#include <__algorithm/half_positive.h>
|
||||
#include <__algorithm/in_found_result.h>
|
||||
#include <__algorithm/in_fun_result.h>
|
||||
#include <__algorithm/in_in_out_result.h>
|
||||
#include <__algorithm/in_in_result.h>
|
||||
|
|
|
@ -248,6 +248,7 @@ module std [system] {
|
|||
module generate { private header "__algorithm/generate.h" }
|
||||
module generate_n { private header "__algorithm/generate_n.h" }
|
||||
module half_positive { private header "__algorithm/half_positive.h" }
|
||||
module in_found_result { private header "__algorithm/in_found_result.h" }
|
||||
module in_fun_result { private header "__algorithm/in_fun_result.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" }
|
||||
|
|
|
@ -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_found_result.h'}}
|
||||
#include <__algorithm/in_found_result.h>
|
|
@ -0,0 +1,89 @@
|
|||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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 I>
|
||||
// struct in_found_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);
|
||||
};
|
||||
static_assert(!std::is_constructible_v<std::ranges::in_found_result<A>, std::ranges::in_found_result<int>>);
|
||||
|
||||
struct B {
|
||||
B(const int&);
|
||||
B(int&&);
|
||||
};
|
||||
static_assert(std::is_constructible_v<std::ranges::in_found_result<B>, std::ranges::in_found_result<int>>);
|
||||
static_assert(std::is_constructible_v<std::ranges::in_found_result<B>, std::ranges::in_found_result<int>&>);
|
||||
static_assert(std::is_constructible_v<std::ranges::in_found_result<B>, const std::ranges::in_found_result<int>>);
|
||||
static_assert(std::is_constructible_v<std::ranges::in_found_result<B>, const std::ranges::in_found_result<int>&>);
|
||||
|
||||
struct C {
|
||||
C(int&);
|
||||
};
|
||||
static_assert(!std::is_constructible_v<std::ranges::in_found_result<C>, std::ranges::in_found_result<int>&>);
|
||||
|
||||
static_assert(std::is_convertible_v<std::ranges::in_found_result<int>&, std::ranges::in_found_result<long>>);
|
||||
static_assert(std::is_convertible_v<const std::ranges::in_found_result<int>&, std::ranges::in_found_result<long>>);
|
||||
static_assert(std::is_convertible_v<std::ranges::in_found_result<int>&&, std::ranges::in_found_result<long>>);
|
||||
static_assert(std::is_convertible_v<const std::ranges::in_found_result<int>&&, std::ranges::in_found_result<long>>);
|
||||
|
||||
struct NotConvertible {};
|
||||
static_assert(!std::is_convertible_v<std::ranges::in_found_result<NotConvertible>, std::ranges::in_found_result<int>>);
|
||||
|
||||
static_assert(std::is_same_v<decltype(std::ranges::in_found_result<int>::in), int>);
|
||||
static_assert(std::is_same_v<decltype(std::ranges::in_found_result<int>::found), bool>);
|
||||
|
||||
constexpr bool test() {
|
||||
{
|
||||
std::ranges::in_found_result<double> res{10, true};
|
||||
assert(res.in == 10);
|
||||
assert(res.found == true);
|
||||
std::ranges::in_found_result<ConvertibleFrom<int>> res2 = res;
|
||||
assert(res2.in.content == 10);
|
||||
assert(res2.found);
|
||||
}
|
||||
{
|
||||
std::ranges::in_found_result<MoveOnly> res{MoveOnly{}, false};
|
||||
assert(res.in.get() == 1);
|
||||
assert(!res.found);
|
||||
auto res2 = std::move(res);
|
||||
assert(res2.in.get() == 1);
|
||||
assert(!res2.found);
|
||||
assert(res.in.get() == 0);
|
||||
assert(!res.found);
|
||||
}
|
||||
auto [in, found] = std::ranges::in_found_result<int>{2, false};
|
||||
assert(in == 2);
|
||||
assert(!found);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int, char**) {
|
||||
test();
|
||||
static_assert(test());
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue