[libc++] [ranges] Whitespace and namespace-style adjustments. NFC.

Largely split out of D116199 to keep that PR smaller.
This commit is contained in:
Arthur O'Dwyer 2021-12-23 14:51:24 -05:00
parent 4191a93ea4
commit 3042091168
4 changed files with 72 additions and 46 deletions

View File

@ -33,7 +33,9 @@ namespace ranges {
} // namespace ranges } // namespace ranges
// [range.access.begin] // [range.access.begin]
namespace ranges::__begin {
namespace ranges {
namespace __begin {
template <class _Tp> template <class _Tp>
concept __member_begin = concept __member_begin =
__can_borrow<_Tp> && __can_borrow<_Tp> &&
@ -79,19 +81,24 @@ namespace ranges::__begin {
void operator()(auto&&) const = delete; void operator()(auto&&) const = delete;
}; };
} // namespace ranges::__begin }
namespace ranges {
inline namespace __cpo { inline namespace __cpo {
inline constexpr auto begin = __begin::__fn{}; inline constexpr auto begin = __begin::__fn{};
} // namespace __cpo } // namespace __cpo
} // namespace ranges
// [range.range]
namespace ranges {
template <class _Tp> template <class _Tp>
using iterator_t = decltype(ranges::begin(declval<_Tp&>())); using iterator_t = decltype(ranges::begin(declval<_Tp&>()));
} // namespace ranges } // namespace ranges
// [range.access.end] // [range.access.end]
namespace ranges::__end {
namespace ranges {
namespace __end {
template <class _Tp> template <class _Tp>
concept __member_end = concept __member_end =
__can_borrow<_Tp> && __can_borrow<_Tp> &&
@ -140,13 +147,17 @@ namespace ranges::__end {
void operator()(auto&&) const = delete; void operator()(auto&&) const = delete;
}; };
} // namespace ranges::__end }
namespace ranges::inline __cpo { inline namespace __cpo {
inline constexpr auto end = __end::__fn{}; inline constexpr auto end = __end::__fn{};
} // namespace ranges::__cpo } // namespace __cpo
} // namespace ranges
namespace ranges::__cbegin { // [range.access.cbegin]
namespace ranges {
namespace __cbegin {
struct __fn { struct __fn {
template <class _Tp> template <class _Tp>
requires invocable<decltype(ranges::begin), _Tp const&> requires invocable<decltype(ranges::begin), _Tp const&>
@ -164,13 +175,17 @@ namespace ranges::__cbegin {
return ranges::begin(static_cast<_Tp const&&>(__t)); return ranges::begin(static_cast<_Tp const&&>(__t));
} }
}; };
} // namespace ranges::__cbegin }
namespace ranges::inline __cpo { inline namespace __cpo {
inline constexpr auto cbegin = __cbegin::__fn{}; inline constexpr auto cbegin = __cbegin::__fn{};
} // namespace ranges::__cpo } // namespace __cpo
} // namespace ranges
namespace ranges::__cend { // [range.access.cend]
namespace ranges {
namespace __cend {
struct __fn { struct __fn {
template <class _Tp> template <class _Tp>
requires invocable<decltype(ranges::end), _Tp const&> requires invocable<decltype(ranges::end), _Tp const&>
@ -188,11 +203,12 @@ namespace ranges::__cend {
return ranges::end(static_cast<_Tp const&&>(__t)); return ranges::end(static_cast<_Tp const&&>(__t));
} }
}; };
} // namespace ranges::__cend }
namespace ranges::inline __cpo { inline namespace __cpo {
inline constexpr auto cend = __cend::__fn{}; inline constexpr auto cend = __cend::__fn{};
} // namespace ranges::__cpo } // namespace __cpo
} // namespace ranges
#endif // !defined(_LIBCPP_HAS_NO_RANGES) #endif // !defined(_LIBCPP_HAS_NO_RANGES)

View File

@ -26,8 +26,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if !defined(_LIBCPP_HAS_NO_RANGES) #if !defined(_LIBCPP_HAS_NO_RANGES)
namespace ranges {
// [range.prim.data] // [range.prim.data]
namespace ranges {
namespace __data { namespace __data {
template <class _Tp> template <class _Tp>
concept __ptr_to_object = is_pointer_v<_Tp> && is_object_v<remove_pointer_t<_Tp>>; concept __ptr_to_object = is_pointer_v<_Tp> && is_object_v<remove_pointer_t<_Tp>>;
@ -64,7 +65,7 @@ namespace __data {
return _VSTD::to_address(ranges::begin(_VSTD::forward<_Tp>(__t))); return _VSTD::to_address(ranges::begin(_VSTD::forward<_Tp>(__t)));
} }
}; };
} // end namespace __data }
inline namespace __cpo { inline namespace __cpo {
inline constexpr auto data = __data::__fn{}; inline constexpr auto data = __data::__fn{};

View File

@ -23,8 +23,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if !defined(_LIBCPP_HAS_NO_RANGES) #if !defined(_LIBCPP_HAS_NO_RANGES)
namespace ranges {
// [range.prim.empty] // [range.prim.empty]
namespace ranges {
namespace __empty { namespace __empty {
template <class _Tp> template <class _Tp>
concept __member_empty = requires(_Tp&& __t) { concept __member_empty = requires(_Tp&& __t) {

View File

@ -28,8 +28,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
namespace ranges { namespace ranges {
template<class> template<class>
inline constexpr bool disable_sized_range = false; inline constexpr bool disable_sized_range = false;
}
// [range.prim.size] // [range.prim.size]
namespace ranges {
namespace __size { namespace __size {
void size(auto&) = delete; void size(auto&) = delete;
void size(const auto&) = delete; void size(const auto&) = delete;
@ -90,18 +93,23 @@ namespace __size {
return _VSTD::__to_unsigned_like(ranges::end(__t) - ranges::begin(__t)); return _VSTD::__to_unsigned_like(ranges::end(__t) - ranges::begin(__t));
} }
}; };
} // end namespace __size }
inline namespace __cpo { inline namespace __cpo {
inline constexpr auto size = __size::__fn{}; inline constexpr auto size = __size::__fn{};
} // namespace __cpo } // namespace __cpo
} // namespace ranges
// [range.prim.ssize]
namespace ranges {
namespace __ssize { namespace __ssize {
struct __fn { struct __fn {
template<class _Tp> template<class _Tp>
requires requires (_Tp&& __t) { ranges::size(__t); } requires requires (_Tp&& __t) { ranges::size(__t); }
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr integral auto operator()(_Tp&& __t) const [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr integral auto operator()(_Tp&& __t) const
noexcept(noexcept(ranges::size(__t))) { noexcept(noexcept(ranges::size(__t)))
{
using _Signed = make_signed_t<decltype(ranges::size(__t))>; using _Signed = make_signed_t<decltype(ranges::size(__t))>;
if constexpr (sizeof(ptrdiff_t) > sizeof(_Signed)) if constexpr (sizeof(ptrdiff_t) > sizeof(_Signed))
return static_cast<ptrdiff_t>(ranges::size(__t)); return static_cast<ptrdiff_t>(ranges::size(__t));