[libcxx][ranges] Add ranges::size CPO.

The begining of [range.prim].

Differential Revision: https://reviews.llvm.org/D101079
This commit is contained in:
zoecarver 2021-04-22 09:29:02 -07:00
parent 1fef5c88a6
commit 600686d75f
5 changed files with 430 additions and 0 deletions

View File

@ -39,6 +39,7 @@ set(files
__ranges/concepts.h
__ranges/enable_borrowed_range.h
__ranges/view.h
__ranges/size.h
__split_buffer
__sso_allocator
__std_stream

View File

@ -0,0 +1,111 @@
// -*- 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___RANGES_SIZE_H
#define _LIBCPP___RANGES_SIZE_H
#include <__config>
#include <__iterator/iterator_traits.h>
#include <__iterator/concepts.h>
#include <__ranges/access.h>
#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD
#if !defined(_LIBCPP_HAS_NO_RANGES)
template<class>
inline constexpr bool disable_sized_range = false;
// clang-format off
namespace ranges {
// [range.prim.size]
namespace __size {
void size(auto&) = delete;
void size(const auto&) = delete;
template <class _Tp>
concept __size_enabled = !disable_sized_range<remove_cvref_t<_Tp>>;
template <class _Tp>
concept __member_size = __size_enabled<_Tp> && requires(_Tp&& __t) {
{ _VSTD::__decay_copy(_VSTD::forward<_Tp>(__t).size()) } -> __integer_like;
};
template <class _Tp>
concept __unqualified_size =
__size_enabled<_Tp> &&
!__member_size<_Tp> &&
__class_or_enum<remove_cvref_t<_Tp>> &&
requires(_Tp&& __t) {
{ _VSTD::__decay_copy(size(_VSTD::forward<_Tp>(__t))) } -> __integer_like;
};
template <class _Tp>
concept __difference =
!__member_size<_Tp> &&
!__unqualified_size<_Tp> &&
__class_or_enum<remove_cvref_t<_Tp>> &&
requires(_Tp&& __t) {
{ ranges::begin(__t) } -> forward_iterator;
{ ranges::end(__t) } -> sized_sentinel_for<decltype(ranges::begin(declval<_Tp>()))>;
};
struct __fn {
template <class _Tp, size_t _Sz>
[[nodiscard]] constexpr size_t operator()(_Tp (&&)[_Sz]) const noexcept {
return _Sz;
}
template <class _Tp, size_t _Sz>
[[nodiscard]] constexpr size_t operator()(_Tp (&)[_Sz]) const noexcept {
return _Sz;
}
template <__member_size _Tp>
[[nodiscard]] constexpr __integer_like auto operator()(_Tp&& __t) const
noexcept(noexcept(_VSTD::forward<_Tp>(__t).size())) {
return _VSTD::forward<_Tp>(__t).size();
}
template <__unqualified_size _Tp>
[[nodiscard]] constexpr __integer_like auto operator()(_Tp&& __t) const
noexcept(noexcept(size(_VSTD::forward<_Tp>(__t)))) {
return size(_VSTD::forward<_Tp>(__t));
}
template<__difference _Tp>
[[nodiscard]] constexpr __integer_like auto operator()(_Tp&& __t) const
noexcept(noexcept(ranges::end(__t) - ranges::begin(__t))) {
return __to_unsigned_like<range_difference_t<remove_cvref_t<_Tp>>>(
ranges::end(__t) - ranges::begin(__t));
}
};
} // end namespace __size
inline namespace __cpo {
inline constexpr auto size = __size::__fn{};
} // namespace __cpo
} // namespace ranges
// clang-format off
#endif // !defined(_LIBCPP_HAS_NO_RANGES)
_LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_SIZE_H

View File

@ -23,6 +23,8 @@ namespace std::ranges {
inline constexpr unspecified end = unspecified;
inline constexpr unspecified cbegin = unspecified;
inline constexpr unspecified cend = unspecified;
inline constexpr unspecified size = unspecified;
}
// [range.range], ranges
@ -77,6 +79,7 @@ namespace std::ranges {
#include <__ranges/concepts.h>
#include <__ranges/enable_borrowed_range.h>
#include <__ranges/view.h>
#include <__ranges/size.h>
#include <compare> // Required by the standard.
#include <initializer_list> // Required by the standard.
#include <iterator> // Required by the standard.

View File

@ -2309,6 +2309,11 @@ struct _LIBCPP_TEMPLATE_VIS make_unsigned
#if _LIBCPP_STD_VER > 11
template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
template<class _From>
[[nodiscard]] constexpr auto __to_unsigned_like(_From __x) noexcept {
return static_cast<make_unsigned_t<_From>>(__x);
}
#endif
#if _LIBCPP_STD_VER > 14

View File

@ -0,0 +1,310 @@
//===----------------------------------------------------------------------===//
//
// 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: gcc-10
// XFAIL: msvc && clang
// std::ranges::size
#include <ranges>
#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
using RangeSizeT = decltype(std::ranges::size);
static_assert(!std::is_invocable_v<RangeSizeT, int[]>);
static_assert( std::is_invocable_v<RangeSizeT, int[1]>);
static_assert( std::is_invocable_v<RangeSizeT, int (&&)[1]>);
static_assert( std::is_invocable_v<RangeSizeT, int (&)[1]>);
static_assert(std::semiregular<std::remove_cv_t<RangeSizeT>>);
struct SizeMember {
constexpr size_t size() { return 42; }
};
static_assert(!std::is_invocable_v<RangeSizeT, const SizeMember>);
struct SizeFunction {
friend constexpr size_t size(SizeFunction) { return 42; }
};
// Make sure the size member is preferred.
struct SizeMemberAndFunction {
constexpr size_t size() { return 42; }
friend constexpr size_t size(SizeMemberAndFunction) { return 0; }
};
bool constexpr testArrayType() {
int a[4];
int b[1];
SizeMember c[4];
SizeFunction d[4];
assert(std::ranges::size(a) == 4);
assert(std::ranges::size(b) == 1);
assert(std::ranges::size(c) == 4);
assert(std::ranges::size(d) == 4);
return true;
}
struct SizeMemberConst {
constexpr size_t size() const { return 42; }
};
struct SizeMemberSigned {
constexpr long size() { return 42; }
};
bool constexpr testHasSizeMember() {
assert(std::ranges::size(SizeMember()) == 42);
const SizeMemberConst sizeMemberConst;
assert(std::ranges::size(sizeMemberConst) == 42);
assert(std::ranges::size(SizeMemberAndFunction()) == 42);
assert(std::ranges::size(SizeMemberSigned()) == 42);
ASSERT_SAME_TYPE(decltype(std::ranges::size(SizeMemberSigned())), long);
return true;
}
struct MoveOnlySizeFunction {
MoveOnlySizeFunction() = default;
MoveOnlySizeFunction(MoveOnlySizeFunction &&) = default;
MoveOnlySizeFunction(MoveOnlySizeFunction const&) = delete;
friend constexpr size_t size(MoveOnlySizeFunction) { return 42; }
};
enum EnumSizeFunction {
a, b
};
constexpr size_t size(EnumSizeFunction) { return 42; }
struct SizeFunctionConst {
friend constexpr size_t size(const SizeFunctionConst) { return 42; }
};
struct SizeFunctionRef {
friend constexpr size_t size(SizeFunctionRef&) { return 42; }
};
struct SizeFunctionConstRef {
friend constexpr size_t size(SizeFunctionConstRef const&) { return 42; }
};
struct SizeFunctionSigned {
friend constexpr long size(SizeFunctionSigned) { return 42; }
};
bool constexpr testHasSizeFunction() {
assert(std::ranges::size(SizeFunction()) == 42);
assert(std::ranges::size(MoveOnlySizeFunction()) == 42);
assert(std::ranges::size(EnumSizeFunction()) == 42);
assert(std::ranges::size(SizeFunctionConst()) == 42);
SizeFunctionRef a;
assert(std::ranges::size(a) == 42);
const SizeFunctionConstRef b;
assert(std::ranges::size(b) == 42);
assert(std::ranges::size(SizeFunctionSigned()) == 42);
ASSERT_SAME_TYPE(decltype(std::ranges::size(SizeFunctionSigned())), long);
return true;
}
struct Empty { };
static_assert(!std::is_invocable_v<RangeSizeT, Empty>);
struct InvalidReturnTypeMember {
Empty size();
};
struct InvalidReturnTypeFunction {
friend Empty size(InvalidReturnTypeFunction);
};
struct Convertible {
operator size_t();
};
struct ConvertibleReturnTypeMember {
Convertible size();
};
struct ConvertibleReturnTypeFunction {
friend Convertible size(ConvertibleReturnTypeFunction);
};
struct BoolReturnTypeMember {
bool size() const;
};
struct BoolReturnTypeFunction {
friend bool size(BoolReturnTypeFunction const&);
};
static_assert(!std::is_invocable_v<RangeSizeT, InvalidReturnTypeMember>);
static_assert(!std::is_invocable_v<RangeSizeT, InvalidReturnTypeFunction>);
static_assert( std::is_invocable_v<RangeSizeT, InvalidReturnTypeMember (&)[4]>);
static_assert( std::is_invocable_v<RangeSizeT, InvalidReturnTypeFunction (&)[4]>);
static_assert(!std::is_invocable_v<RangeSizeT, ConvertibleReturnTypeMember>);
static_assert(!std::is_invocable_v<RangeSizeT, ConvertibleReturnTypeFunction>);
static_assert(!std::is_invocable_v<RangeSizeT, BoolReturnTypeMember const&>);
static_assert(!std::is_invocable_v<RangeSizeT, BoolReturnTypeFunction const&>);
struct SizeMemberDisabled {
size_t size() { return 42; }
};
template<>
inline constexpr bool std::disable_sized_range<SizeMemberDisabled> = true;
struct ImproperlyDisabledMember {
size_t size() const { return 42; }
};
// Intentionally disabling "const ConstSizeMemberDisabled". This doesn't disable anything
// because T is always uncvrefed before being checked.
template<>
inline constexpr bool std::disable_sized_range<const ImproperlyDisabledMember> = true;
struct SizeFunctionDisabled {
friend size_t size(SizeFunctionDisabled) { return 42; }
};
template<>
inline constexpr bool std::disable_sized_range<SizeFunctionDisabled> = true;
struct ImproperlyDisabledFunction {
friend size_t size(ImproperlyDisabledFunction const&) { return 42; }
};
template<>
inline constexpr bool std::disable_sized_range<const ImproperlyDisabledFunction> = true;
static_assert( std::is_invocable_v<RangeSizeT, ImproperlyDisabledMember&>);
static_assert( std::is_invocable_v<RangeSizeT, const ImproperlyDisabledMember&>);
static_assert(!std::is_invocable_v<RangeSizeT, ImproperlyDisabledFunction&>);
static_assert( std::is_invocable_v<RangeSizeT, const ImproperlyDisabledFunction&>);
// No begin end.
struct HasMinusOperator {
friend constexpr size_t operator-(HasMinusOperator, HasMinusOperator) { return 2; }
};
static_assert(!std::is_invocable_v<RangeSizeT, HasMinusOperator>);
struct HasMinusBeginEnd {
struct sentinel {
friend bool operator==(sentinel, forward_iterator<int*>);
friend constexpr std::ptrdiff_t operator-(const sentinel, const forward_iterator<int*>) { return 2; }
friend constexpr std::ptrdiff_t operator-(const forward_iterator<int*>, const sentinel) { return 2; }
};
friend constexpr forward_iterator<int*> begin(HasMinusBeginEnd) { return {}; }
friend constexpr sentinel end(HasMinusBeginEnd) { return {}; }
};
struct other_forward_iterator : forward_iterator<int*> { };
struct InvalidMinusBeginEnd {
struct sentinel {
friend bool operator==(sentinel, other_forward_iterator);
friend constexpr std::ptrdiff_t operator-(const sentinel, const other_forward_iterator) { return 2; }
friend constexpr std::ptrdiff_t operator-(const other_forward_iterator, const sentinel) { return 2; }
};
friend constexpr other_forward_iterator begin(InvalidMinusBeginEnd) { return {}; }
friend constexpr sentinel end(InvalidMinusBeginEnd) { return {}; }
};
// short is integer-like, but it is not other_forward_iterator's difference_type.
static_assert(!std::same_as<other_forward_iterator::difference_type, short>);
static_assert(!std::is_invocable_v<RangeSizeT, InvalidMinusBeginEnd>);
struct RandomAccessRange {
struct sentinel {
friend bool operator==(sentinel, random_access_iterator<int*>);
friend constexpr std::ptrdiff_t operator-(const sentinel, const random_access_iterator<int*>) { return 2; }
friend constexpr std::ptrdiff_t operator-(const random_access_iterator<int*>, const sentinel) { return 2; }
};
constexpr random_access_iterator<int*> begin() { return {}; }
constexpr sentinel end() { return {}; }
};
struct IntPtrBeginAndEnd {
int buff[8];
constexpr int* begin() { return buff; }
constexpr int* end() { return buff + 8; }
};
struct DisabledSizeRangeWithBeginEnd {
int buff[8];
constexpr int* begin() { return buff; }
constexpr int* end() { return buff + 8; }
constexpr size_t size() { return 1; }
};
template<>
inline constexpr bool std::disable_sized_range<DisabledSizeRangeWithBeginEnd> = true;
struct SizeBeginAndEndMembers {
int buff[8];
constexpr int* begin() { return buff; }
constexpr int* end() { return buff + 8; }
constexpr size_t size() { return 1; }
};
constexpr bool testRanges() {
HasMinusBeginEnd a;
assert(std::ranges::size(a) == 2);
// Ensure that this is converted to an *unsigned* type.
ASSERT_SAME_TYPE(decltype(std::ranges::size(a)), size_t);
IntPtrBeginAndEnd b;
assert(std::ranges::size(b) == 8);
DisabledSizeRangeWithBeginEnd c;
assert(std::ranges::size(c) == 8);
RandomAccessRange d;
assert(std::ranges::size(d) == 2);
ASSERT_SAME_TYPE(decltype(std::ranges::size(d)), size_t);
SizeBeginAndEndMembers e;
assert(std::ranges::size(e) == 1);
return true;
}
int main(int, char**) {
testArrayType();
static_assert(testArrayType());
testHasSizeMember();
static_assert(testHasSizeMember());
testHasSizeFunction();
static_assert(testHasSizeFunction());
testRanges();
static_assert(testRanges());
return 0;
}