Index: libcxx/include/span =================================================================== --- libcxx/include/span +++ libcxx/include/span @@ -522,6 +522,35 @@ index_type __size; }; +// tuple interface +template +struct _LIBCPP_TEMPLATE_VIS tuple_size> + : public integral_constant {}; + +template +struct _LIBCPP_TEMPLATE_VIS tuple_size>; // declared but not defined + + +template +class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, span<_Tp, _Size>> +{ + static_assert( dynamic_extent != _Size, "std::tuple_element<> not supported for std::span"); + static_assert(_Ip < _Size, "Index out of bounds in std::tuple_element<> (std::span)"); +public: + typedef _Tp type; +}; + +template +_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR +_Tp& +get(span<_Tp, _Size> __s) _NOEXCEPT +{ + static_assert( dynamic_extent != _Size, "std::get<> not supported for std::span"); + static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::span)"); + return __s[_Ip]; +} + + // as_bytes & as_writeable_bytes template auto as_bytes(span<_Tp, _Extent> __s) noexcept Index: libcxx/test/std/containers/views/span.tuple/get.fail.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/views/span.tuple/get.fail.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// 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++98, c++03, c++11, c++14, c++17 + +// + +// template +// constexpr ElementType& get(span s) noexcept; + +#include + +#include "test_macros.h" + + +int main(int, char**) +{ +// No get for dynamic spans + constexpr int arr [] = {0,1,2,3,4,5,6,7,8,9}; + (void) std::get< 0>(std::span(arr, (size_t)0)); // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::get<> (std::span)"}} + (void) std::get< 5>(std::span(arr, 5)); // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::get<> (std::span)"}} + (void) std::get<20>(std::span(arr, 10)); // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::get<> (std::span)"}} + + return 0; +} Index: libcxx/test/std/containers/views/span.tuple/get.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/views/span.tuple/get.pass.cpp @@ -0,0 +1,75 @@ +// -*- C++ -*- +//===------------------------------ span ---------------------------------===// +// +// 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++98, c++03, c++11, c++14, c++17 + +// + +// template +// constexpr ElementType& get(span s) noexcept; +// + + +#include +#include +#include + +#include "test_macros.h" + + +template +constexpr bool testConstexprSpan(Span sp, typename Span::pointer ptr) +{ + ASSERT_NOEXCEPT(std::get(sp)); + return std::addressof(std::get(sp)) == ptr; +} + + +template +void testRuntimeSpan(Span sp, typename Span::pointer ptr) +{ + ASSERT_NOEXCEPT(std::get(sp)); + assert(std::addressof(std::get(sp)) == ptr); +} + +struct A{}; +constexpr int iArr1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + int iArr2[] = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19}; + +int main(int, char**) +{ + +// static size + static_assert(testConstexprSpan<0>(std::span(iArr1, 1), iArr1 + 0), ""); + static_assert(testConstexprSpan<1>(std::span(iArr1, 2), iArr1 + 1), ""); + static_assert(testConstexprSpan<2>(std::span(iArr1, 3), iArr1 + 2), ""); + static_assert(testConstexprSpan<3>(std::span(iArr1, 4), iArr1 + 3), ""); + + static_assert(testConstexprSpan<0>(std::span(iArr1 + 1, 1), iArr1 + 1), ""); + static_assert(testConstexprSpan<1>(std::span(iArr1 + 2, 2), iArr1 + 3), ""); + static_assert(testConstexprSpan<2>(std::span(iArr1 + 3, 3), iArr1 + 5), ""); + static_assert(testConstexprSpan<3>(std::span(iArr1 + 4, 4), iArr1 + 7), ""); + +// static size + testRuntimeSpan<0>(std::span(iArr2, 4), iArr2); + testRuntimeSpan<1>(std::span(iArr2, 1), iArr2 + 1); + testRuntimeSpan<2>(std::span(iArr2, 2), iArr2 + 2); + testRuntimeSpan<3>(std::span(iArr2, 3), iArr2 + 3); + + testRuntimeSpan<0>(std::span(iArr2 + 1, 1), iArr2 + 1); + testRuntimeSpan<1>(std::span(iArr2 + 2, 2), iArr2 + 3); + testRuntimeSpan<2>(std::span(iArr2 + 3, 3), iArr2 + 5); + testRuntimeSpan<3>(std::span(iArr2 + 4, 4), iArr2 + 7); + + + std::string s; + testRuntimeSpan<0>(std::span(&s, 1), &s); + + + return 0; +} Index: libcxx/test/std/containers/views/span.tuple/tuple_element.fail.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/views/span.tuple/tuple_element.fail.cpp @@ -0,0 +1,27 @@ +//===----------------------------------------------------------------------===// +// +// 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++98, c++03, c++11, c++14, c++17 + +// + +// tuple_element >::type + +#include + +#include "test_macros.h" + + +int main(int, char**) +{ +// No tuple_element for dynamic spans + using T1 = typename std::tuple_element< 0, std::span>::type; // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::tuple_element<> (std::span)"}} + using T2 = typename std::tuple_element< 5, std::span>::type; // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::tuple_element<> (std::span)"}} + using T3 = typename std::tuple_element<20, std::span>::type; // expected-error-re@span:* {{static_assert failed{{( due to requirement '.*')?}} "Index out of bounds in std::tuple_element<> (std::span)"}} + + return 0; +} Index: libcxx/test/std/containers/views/span.tuple/tuple_element.pass.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/views/span.tuple/tuple_element.pass.cpp @@ -0,0 +1,52 @@ +//===----------------------------------------------------------------------===// +// +// 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++98, c++03, c++11, c++14, c++17 + +// + +// tuple_element >::type + +#include + +#include "test_macros.h" + +template +void test() +{ + { + typedef std::span C; + ASSERT_SAME_TYPE(typename std::tuple_element::type, T); + } + { + typedef std::span C; + ASSERT_SAME_TYPE(typename std::tuple_element::type, T const); + } + { + typedef std::span C; + ASSERT_SAME_TYPE(typename std::tuple_element::type, T volatile); + } + { + typedef std::span C; + ASSERT_SAME_TYPE(typename std::tuple_element::type, T const volatile); + } +} + +int main(int, char**) +{ + test(); + test(); + test(); + + test(); + test(); + test(); + test(); + test(); + + return 0; +} Index: libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp =================================================================== --- /dev/null +++ libcxx/test/std/containers/views/span.tuple/tuple_size.fail.cpp @@ -0,0 +1,21 @@ +//===----------------------------------------------------------------------===// +// +// 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++98, c++03, c++11, c++14, c++17 + +// + +// tuple_size >::value + +#include + +int main(int, char**) +{ + (void) std::tuple_size>::value; // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size>::value; // expected-error-re {{implicit instantiation of undefined template 'std::__1::tuple_size + +// tuple_size >::value + +#include + +template +void test() +{ + { + typedef std::span C; + static_assert((std::tuple_size::value == N), ""); + } + { + typedef std::span C; + static_assert((std::tuple_size::value == N), ""); + } + { + typedef std::span C; + static_assert((std::tuple_size::value == N), ""); + } + { + typedef std::span C; + static_assert((std::tuple_size::value == N), ""); + } +} + +int main(int, char**) +{ + test(); + test(); + test(); + + return 0; +}