diff options
| -rw-r--r-- | libcxx/include/span | 44 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.eq.pass.cpp | 168 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.ge.pass.cpp | 153 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.gt.pass.cpp | 154 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.le.pass.cpp | 153 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.lt.pass.cpp | 154 | ||||
| -rw-r--r-- | libcxx/test/std/containers/views/span.comparison/op.ne.pass.cpp | 168 | ||||
| -rw-r--r-- | libcxx/www/cxx2a_status.html | 4 |
8 files changed, 2 insertions, 996 deletions
diff --git a/libcxx/include/span b/libcxx/include/span index ea7aecb5886..cebe98760f2 100644 --- a/libcxx/include/span +++ b/libcxx/include/span @@ -23,20 +23,6 @@ inline constexpr ptrdiff_t dynamic_extent = -1; template <class ElementType, ptrdiff_t Extent = dynamic_extent> class span; -// [span.comparison], span comparison operators -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator==(span<T, X> l, span<U, Y> r); -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator!=(span<T, X> l, span<U, Y> r); -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator<(span<T, X> l, span<U, Y> r); -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator<=(span<T, X> l, span<U, Y> r); -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator>(span<T, X> l, span<U, Y> r); -template <class T, ptrdiff_t X, class U, ptrdiff_t Y> - constexpr bool operator>=(span<T, X> l, span<U, Y> r); - // [span.objectrep], views of object representation template <class ElementType, ptrdiff_t Extent> span<const byte, ((Extent == dynamic_extent) ? dynamic_extent : @@ -539,36 +525,6 @@ private: index_type __size; }; -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator==(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return equal(__lhs.begin(), __lhs.end(), __rhs.begin(), __rhs.end()); } - -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator!=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__rhs == __lhs); } - -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator< (const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return lexicographical_compare (__lhs.begin(), __lhs.end(), __rhs.begin(), __rhs.end()); } - -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator<=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__rhs < __lhs); } - -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator> (const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return __rhs < __lhs; } - -template <class _Tp1, ptrdiff_t _Extent1, class _Tp2, ptrdiff_t _Extent2> - constexpr bool - operator>=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__lhs < __rhs); } - // as_bytes & as_writeable_bytes template <class _Tp, ptrdiff_t _Extent> auto as_bytes(span<_Tp, _Extent> __s) noexcept diff --git a/libcxx/test/std/containers/views/span.comparison/op.eq.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.eq.pass.cpp deleted file mode 100644 index 353f4aeef9e..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.eq.pass.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator==(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: return equal(l.begin(), l.end(), r.begin(), r.end()); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert( (csp0d == csp0d), ""); - static_assert( (csp0s == csp0s), ""); - static_assert( (csp0s == csp0d), ""); - static_assert( (csp0d == csp0s), ""); - - static_assert(!(csp0d == csp1d), ""); - static_assert(!(csp0s == csp1s), ""); - static_assert(!(csp0s == csp1d), ""); - static_assert(!(csp0d == csp1s), ""); - - static_assert( (csp1d == csp1s), ""); - static_assert( (csp1s == csp1d), ""); - - static_assert( (csp2d == csp3d), ""); - static_assert( (csp2s == csp3s), ""); - static_assert( (csp2d == csp3s), ""); - static_assert( (csp2s == csp3d), ""); - - static_assert( (csp2d == csp3d), ""); - static_assert( (csp2s == csp3s), ""); - static_assert( (csp2d == csp3s), ""); - static_assert( (csp2s == csp3d), ""); - - static_assert(!(csp2d == csp4d), ""); - static_assert(!(csp2s == csp4s), ""); - static_assert(!(csp2d == csp4s), ""); - static_assert(!(csp2s == csp4d), ""); - - static_assert(!(csp4d == csp2d), ""); - static_assert(!(csp4s == csp2s), ""); - static_assert(!(csp4d == csp2s), ""); - static_assert(!(csp4s == csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert( (sp0d == sp0d)); - assert( (sp0s == sp0s)); - assert( (sp0s == sp0d)); - assert( (sp0d == sp0s)); - - assert(!(sp0d == sp1d)); - assert(!(sp0s == sp1s)); - assert(!(sp0s == sp1d)); - assert(!(sp0d == sp1s)); - - assert( (sp1d == sp1s)); - assert( (sp1s == sp1d)); - - assert( (sp2d == sp3d)); - assert( (sp2s == sp3s)); - assert( (sp2d == sp3s)); - assert( (sp2s == sp3d)); - - assert( (sp2d == sp3d)); - assert( (sp2s == sp3s)); - assert( (sp2d == sp3s)); - assert( (sp2s == sp3d)); - - assert(!(sp2d == sp4d)); - assert(!(sp2s == sp4s)); - assert(!(sp2d == sp4s)); - assert(!(sp2s == sp4d)); - - assert(!(sp4d == sp2d)); - assert(!(sp4s == sp2s)); - assert(!(sp4d == sp2s)); - assert(!(sp4s == sp2d)); - -// cross type comparisons - assert( (csp0d == sp0d)); - assert( (csp0s == sp0s)); - assert( (csp0s == sp0d)); - assert( (csp0d == sp0s)); - - assert(!(csp0d == sp1d)); - assert(!(csp0s == sp1s)); - assert(!(csp0s == sp1d)); - assert(!(csp0d == sp1s)); - - assert( (csp1d == sp1s)); - assert( (csp1s == sp1d)); - - assert( (csp2d == sp3d)); - assert( (csp2s == sp3s)); - assert( (csp2d == sp3s)); - assert( (csp2s == sp3d)); - - assert( (csp2d == sp3d)); - assert( (csp2s == sp3s)); - assert( (csp2d == sp3s)); - assert( (csp2s == sp3d)); - - assert(!(csp2d == sp4d)); - assert(!(csp2s == sp4s)); - assert(!(csp2d == sp4s)); - assert(!(csp2s == sp4d)); - - assert(!(csp4d == sp2d)); - assert(!(csp4s == sp2s)); - assert(!(csp4d == sp2s)); - assert(!(csp4s == sp2d)); - -// More cross-type comparisons (int vs float) - static_assert(std::span<const float>{fArr1} == std::span<const int>{iArr1}, ""); - static_assert(std::span<const int>{iArr1} == std::span<const float>{fArr1}, ""); - assert(std::span<float>{fArr2} == std::span<int>{iArr2}); - assert(std::span<int>{iArr2} == std::span<float>{fArr2}); - - static_assert(!(std::span<const int>{iArr1, 9} == std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/test/std/containers/views/span.comparison/op.ge.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.ge.pass.cpp deleted file mode 100644 index 65c2a85da1a..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.ge.pass.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator>=(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: return !(l < r); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert( (csp0d >= csp0d), ""); - static_assert( (csp0s >= csp0s), ""); - static_assert( (csp0s >= csp0d), ""); - static_assert( (csp0d >= csp0s), ""); - - static_assert(!(csp0d >= csp1d), ""); - static_assert(!(csp0s >= csp1s), ""); - static_assert(!(csp0s >= csp1d), ""); - static_assert(!(csp0d >= csp1s), ""); - - static_assert( (csp1d >= csp1s), ""); - static_assert( (csp1s >= csp1d), ""); - - static_assert( (csp2d >= csp3d), ""); - static_assert( (csp2s >= csp3s), ""); - static_assert( (csp2d >= csp3s), ""); - static_assert( (csp2s >= csp3d), ""); - - static_assert(!(csp2d >= csp4d), ""); - static_assert(!(csp2s >= csp4s), ""); - static_assert(!(csp2d >= csp4s), ""); - static_assert(!(csp2s >= csp4d), ""); - - static_assert( (csp4d >= csp2d), ""); - static_assert( (csp4s >= csp2s), ""); - static_assert( (csp4d >= csp2s), ""); - static_assert( (csp4s >= csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert( (sp0d >= sp0d)); - assert( (sp0s >= sp0s)); - assert( (sp0s >= sp0d)); - assert( (sp0d >= sp0s)); - - assert(!(sp0d >= sp1d)); - assert(!(sp0s >= sp1s)); - assert(!(sp0s >= sp1d)); - assert(!(sp0d >= sp1s)); - - assert( (sp1d >= sp1s)); - assert( (sp1s >= sp1d)); - - assert( (sp2d >= sp3d)); - assert( (sp2s >= sp3s)); - assert( (sp2d >= sp3s)); - assert( (sp2s >= sp3d)); - - assert(!(sp2d >= sp4d)); - assert(!(sp2s >= sp4s)); - assert(!(sp2d >= sp4s)); - assert(!(sp2s >= sp4d)); - - assert( (sp4d > sp2d)); - assert( (sp4s > sp2s)); - assert( (sp4d > sp2s)); - assert( (sp4s > sp2d)); - -// cross type comparisons - assert( (csp0d >= sp0d)); - assert( (csp0s >= sp0s)); - assert( (csp0s >= sp0d)); - assert( (csp0d >= sp0s)); - - assert(!(csp0d >= sp1d)); - assert(!(csp0s >= sp1s)); - assert(!(csp0s >= sp1d)); - assert(!(csp0d >= sp1s)); - - assert( (csp1d >= sp1s)); - assert( (csp1s >= sp1d)); - - assert( (csp2d >= sp3d)); - assert( (csp2s >= sp3s)); - assert( (csp2d >= sp3s)); - assert( (csp2s >= sp3d)); - - assert(!(csp2d >= sp4d)); - assert(!(csp2s >= sp4s)); - assert(!(csp2d >= sp4s)); - assert(!(csp2s >= sp4d)); - - assert( (csp4d > sp2d)); - assert( (csp4s > sp2s)); - assert( (csp4d > sp2s)); - assert( (csp4s > sp2d)); - -// More cross-type comparisons (int vs float) - static_assert(!(std::span<const float>{fArr1, 8} >= std::span<const int>{iArr1, 9}), ""); - static_assert(!(std::span<const int>{iArr1, 8} >= std::span<const float>{fArr1, 9}), ""); - assert( (std::span<float>{fArr2} >= std::span<int>{iArr2})); - assert( (std::span<int>{iArr2} >= std::span<float>{fArr2})); - - static_assert( (std::span<const int>{iArr1, 9} >= std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/test/std/containers/views/span.comparison/op.gt.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.gt.pass.cpp deleted file mode 100644 index 396d5a21b4d..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.gt.pass.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator>(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: return (r < l); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert(!(csp0d > csp0d), ""); - static_assert(!(csp0s > csp0s), ""); - static_assert(!(csp0s > csp0d), ""); - static_assert(!(csp0d > csp0s), ""); - - static_assert(!(csp0d > csp1d), ""); - static_assert(!(csp0s > csp1s), ""); - static_assert(!(csp0s > csp1d), ""); - static_assert(!(csp0d > csp1s), ""); - - static_assert(!(csp1d > csp1s), ""); - static_assert(!(csp1s > csp1d), ""); - - static_assert(!(csp2d > csp3d), ""); - static_assert(!(csp2s > csp3s), ""); - static_assert(!(csp2d > csp3s), ""); - static_assert(!(csp2s > csp3d), ""); - - static_assert(!(csp2d > csp4d), ""); - static_assert(!(csp2s > csp4s), ""); - static_assert(!(csp2d > csp4s), ""); - static_assert(!(csp2s > csp4d), ""); - - static_assert( (csp4d > csp2d), ""); - static_assert( (csp4s > csp2s), ""); - static_assert( (csp4d > csp2s), ""); - static_assert( (csp4s > csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert(!(sp0d > sp0d)); - assert(!(sp0s > sp0s)); - assert(!(sp0s > sp0d)); - assert(!(sp0d > sp0s)); - - assert(!(sp0d > sp1d)); - assert(!(sp0s > sp1s)); - assert(!(sp0s > sp1d)); - assert(!(sp0d > sp1s)); - - assert(!(sp1d > sp1s)); - assert(!(sp1s > sp1d)); - - assert(!(sp2d > sp3d)); - assert(!(sp2s > sp3s)); - assert(!(sp2d > sp3s)); - assert(!(sp2s > sp3d)); - - assert(!(sp2d > sp4d)); - assert(!(sp2s > sp4s)); - assert(!(sp2d > sp4s)); - assert(!(sp2s > sp4d)); - - assert( (sp4d > sp2d)); - assert( (sp4s > sp2s)); - assert( (sp4d > sp2s)); - assert( (sp4s > sp2d)); - -// cross type comparisons - assert(!(csp0d > sp0d)); - assert(!(csp0s > sp0s)); - assert(!(csp0s > sp0d)); - assert(!(csp0d > sp0s)); - - assert(!(csp0d > sp1d)); - assert(!(csp0s > sp1s)); - assert(!(csp0s > sp1d)); - assert(!(csp0d > sp1s)); - - assert(!(csp1d > sp1s)); - assert(!(csp1s > sp1d)); - - assert(!(csp2d > sp3d)); - assert(!(csp2s > sp3s)); - assert(!(csp2d > sp3s)); - assert(!(csp2s > sp3d)); - - assert(!(csp2d > sp4d)); - assert(!(csp2s > sp4s)); - assert(!(csp2d > sp4s)); - assert(!(csp2s > sp4d)); - - assert( (csp4d > sp2d)); - assert( (csp4s > sp2s)); - assert( (csp4d > sp2s)); - assert( (csp4s > sp2d)); - - -// More cross-type comparisons (int vs float) - static_assert(!(std::span<const float>{fArr1, 8} > std::span<const int>{iArr1, 9}), ""); - static_assert(!(std::span<const int>{iArr1, 8} > std::span<const float>{fArr1, 9}), ""); - assert(!(std::span<float>{fArr2} > std::span<int>{iArr2})); - assert(!(std::span<int>{iArr2} > std::span<float>{fArr2})); - - static_assert( (std::span<const int>{iArr1, 9} > std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/test/std/containers/views/span.comparison/op.le.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.le.pass.cpp deleted file mode 100644 index 420410c46c6..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.le.pass.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator<=(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: return !(r < l); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert( (csp0d <= csp0d), ""); - static_assert( (csp0s <= csp0s), ""); - static_assert( (csp0s <= csp0d), ""); - static_assert( (csp0d <= csp0s), ""); - - static_assert( (csp0d <= csp1d), ""); - static_assert( (csp0s <= csp1s), ""); - static_assert( (csp0s <= csp1d), ""); - static_assert( (csp0d <= csp1s), ""); - - static_assert( (csp1d <= csp1s), ""); - static_assert( (csp1s <= csp1d), ""); - - static_assert( (csp2d <= csp3d), ""); - static_assert( (csp2s <= csp3s), ""); - static_assert( (csp2d <= csp3s), ""); - static_assert( (csp2s <= csp3d), ""); - - static_assert( (csp2d <= csp4d), ""); - static_assert( (csp2s <= csp4s), ""); - static_assert( (csp2d <= csp4s), ""); - static_assert( (csp2s <= csp4d), ""); - - static_assert(!(csp4d <= csp2d), ""); - static_assert(!(csp4s <= csp2s), ""); - static_assert(!(csp4d <= csp2s), ""); - static_assert(!(csp4s <= csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert( (sp0d <= sp0d)); - assert( (sp0s <= sp0s)); - assert( (sp0s <= sp0d)); - assert( (sp0d <= sp0s)); - - assert( (sp0d <= sp1d)); - assert( (sp0s <= sp1s)); - assert( (sp0s <= sp1d)); - assert( (sp0d <= sp1s)); - - assert( (sp1d <= sp1s)); - assert( (sp1s <= sp1d)); - - assert( (sp2d <= sp3d)); - assert( (sp2s <= sp3s)); - assert( (sp2d <= sp3s)); - assert( (sp2s <= sp3d)); - - assert( (sp2d <= sp4d)); - assert( (sp2s <= sp4s)); - assert( (sp2d <= sp4s)); - assert( (sp2s <= sp4d)); - - assert(!(sp4d <= sp2d)); - assert(!(sp4s <= sp2s)); - assert(!(sp4d <= sp2s)); - assert(!(sp4s <= sp2d)); - -// cross type comparisons - assert( (csp0d <= sp0d)); - assert( (csp0s <= sp0s)); - assert( (csp0s <= sp0d)); - assert( (csp0d <= sp0s)); - - assert( (csp0d <= sp1d)); - assert( (csp0s <= sp1s)); - assert( (csp0s <= sp1d)); - assert( (csp0d <= sp1s)); - - assert( (csp1d <= sp1s)); - assert( (csp1s <= sp1d)); - - assert( (csp2d <= sp3d)); - assert( (csp2s <= sp3s)); - assert( (csp2d <= sp3s)); - assert( (csp2s <= sp3d)); - - assert( (csp2d <= sp4d)); - assert( (csp2s <= sp4s)); - assert( (csp2d <= sp4s)); - assert( (csp2s <= sp4d)); - - assert(!(csp4d <= sp2d)); - assert(!(csp4s <= sp2s)); - assert(!(csp4d <= sp2s)); - assert(!(csp4s <= sp2d)); - -// More cross-type comparisons (int vs float) - static_assert(std::span<const float>{fArr1, 8} <= std::span<const int>{iArr1, 9}, ""); - static_assert(std::span<const int>{iArr1, 8} <= std::span<const float>{fArr1, 9}, ""); - assert( (std::span<float>{fArr2} <= std::span<int>{iArr2})); - assert( (std::span<int>{iArr2} <= std::span<float>{fArr2})); - - static_assert(!(std::span<const int>{iArr1, 9} <= std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/test/std/containers/views/span.comparison/op.lt.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.lt.pass.cpp deleted file mode 100644 index 0ccc2446e42..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.lt.pass.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator<(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: -// return lexicographical_compare(l.begin(), l.end(), r.begin(), r.end()); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert(!(csp0d < csp0d), ""); - static_assert(!(csp0s < csp0s), ""); - static_assert(!(csp0s < csp0d), ""); - static_assert(!(csp0d < csp0s), ""); - - static_assert( (csp0d < csp1d), ""); - static_assert( (csp0s < csp1s), ""); - static_assert( (csp0s < csp1d), ""); - static_assert( (csp0d < csp1s), ""); - - static_assert(!(csp1d < csp1s), ""); - static_assert(!(csp1s < csp1d), ""); - - static_assert(!(csp2d < csp3d), ""); - static_assert(!(csp2s < csp3s), ""); - static_assert(!(csp2d < csp3s), ""); - static_assert(!(csp2s < csp3d), ""); - - static_assert( (csp2d < csp4d), ""); - static_assert( (csp2s < csp4s), ""); - static_assert( (csp2d < csp4s), ""); - static_assert( (csp2s < csp4d), ""); - - static_assert(!(csp4d < csp2d), ""); - static_assert(!(csp4s < csp2s), ""); - static_assert(!(csp4d < csp2s), ""); - static_assert(!(csp4s < csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert(!(sp0d < sp0d)); - assert(!(sp0s < sp0s)); - assert(!(sp0s < sp0d)); - assert(!(sp0d < sp0s)); - - assert( (sp0d < sp1d)); - assert( (sp0s < sp1s)); - assert( (sp0s < sp1d)); - assert( (sp0d < sp1s)); - - assert(!(sp1d < sp1s)); - assert(!(sp1s < sp1d)); - - assert(!(sp2d < sp3d)); - assert(!(sp2s < sp3s)); - assert(!(sp2d < sp3s)); - assert(!(sp2s < sp3d)); - - assert( (sp2d < sp4d)); - assert( (sp2s < sp4s)); - assert( (sp2d < sp4s)); - assert( (sp2s < sp4d)); - - assert(!(sp4d < sp2d)); - assert(!(sp4s < sp2s)); - assert(!(sp4d < sp2s)); - assert(!(sp4s < sp2d)); - -// cross type comparisons - assert(!(csp0d < sp0d)); - assert(!(csp0s < sp0s)); - assert(!(csp0s < sp0d)); - assert(!(csp0d < sp0s)); - - assert( (csp0d < sp1d)); - assert( (csp0s < sp1s)); - assert( (csp0s < sp1d)); - assert( (csp0d < sp1s)); - - assert(!(csp1d < sp1s)); - assert(!(csp1s < sp1d)); - - assert(!(csp2d < sp3d)); - assert(!(csp2s < sp3s)); - assert(!(csp2d < sp3s)); - assert(!(csp2s < sp3d)); - - assert( (csp2d < sp4d)); - assert( (csp2s < sp4s)); - assert( (csp2d < sp4s)); - assert( (csp2s < sp4d)); - - assert(!(csp4d < sp2d)); - assert(!(csp4s < sp2s)); - assert(!(csp4d < sp2s)); - assert(!(csp4s < sp2d)); - -// More cross-type comparisons (int vs float) - static_assert(std::span<const float>{fArr1, 8} < std::span<const int>{iArr1, 9}, ""); - static_assert(std::span<const int>{iArr1, 8} < std::span<const float>{fArr1, 9}, ""); - assert(!(std::span<float>{fArr2} < std::span<int>{iArr2})); - assert(!(std::span<int>{iArr2} < std::span<float>{fArr2})); - - static_assert(!(std::span<const int>{iArr1, 9} < std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/test/std/containers/views/span.comparison/op.ne.pass.cpp b/libcxx/test/std/containers/views/span.comparison/op.ne.pass.cpp deleted file mode 100644 index 117d1d067f8..00000000000 --- a/libcxx/test/std/containers/views/span.comparison/op.ne.pass.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// -*- C++ -*- -//===------------------------------ span ---------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===---------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 - -// <span> - -// template<class T, ptrdiff_t X, class U, ptrdiff_t Y> -// constexpr bool operator!=(span<T, X> l, span<U, Y> r); -// -// -// Effects: Equivalent to: return !(l == r); -// - -#include <span> -#include <cassert> - -#include "test_macros.h" - -struct A{}; -bool operator==(A, A) {return true;} - -constexpr int iArr1[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; - int iArr2[] = { 0, 1, 2, 1, 2, 5, 6, 7, 8, 9}; -constexpr float fArr1[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - float fArr2[] = {0., 1., 2., 1., 2., 5., 6., 7., 8., 9.}; - - -int main () { - - constexpr std::span<const int> csp0d{}; - constexpr std::span<const int> csp1d{iArr1, 10}; - constexpr std::span<const int> csp2d{iArr1 + 3, 2}; - constexpr std::span<const int> csp3d{iArr1 + 1, 2}; - constexpr std::span<const int> csp4d{iArr1 + 6, 2}; - - constexpr std::span<const int, 0> csp0s{}; - constexpr std::span<const int, 10> csp1s{iArr1, 10}; - constexpr std::span<const int, 2> csp2s{iArr1 + 3, 2}; - constexpr std::span<const int, 2> csp3s{iArr1 + 1, 2}; - constexpr std::span<const int, 2> csp4s{iArr1 + 6, 2}; - - static_assert(!(csp0d != csp0d), ""); - static_assert(!(csp0s != csp0s), ""); - static_assert(!(csp0s != csp0d), ""); - static_assert(!(csp0d != csp0s), ""); - - static_assert( (csp0d != csp1d), ""); - static_assert( (csp0s != csp1s), ""); - static_assert( (csp0s != csp1d), ""); - static_assert( (csp0d != csp1s), ""); - - static_assert(!(csp1d != csp1s), ""); - static_assert(!(csp1s != csp1d), ""); - - static_assert(!(csp2d != csp3d), ""); - static_assert(!(csp2s != csp3s), ""); - static_assert(!(csp2d != csp3s), ""); - static_assert(!(csp2s != csp3d), ""); - - static_assert(!(csp2d != csp3d), ""); - static_assert(!(csp2s != csp3s), ""); - static_assert(!(csp2d != csp3s), ""); - static_assert(!(csp2s != csp3d), ""); - - static_assert( (csp2d != csp4d), ""); - static_assert( (csp2s != csp4s), ""); - static_assert( (csp2d != csp4s), ""); - static_assert( (csp2s != csp4d), ""); - - static_assert( (csp4d != csp2d), ""); - static_assert( (csp4s != csp2s), ""); - static_assert( (csp4d != csp2s), ""); - static_assert( (csp4s != csp2d), ""); - - std::span<int> sp0d{}; - std::span<int> sp1d{iArr2, 10}; - std::span<int> sp2d{iArr2 + 3, 2}; - std::span<int> sp3d{iArr2 + 1, 2}; - std::span<int> sp4d{iArr2 + 6, 2}; - - std::span<int, 0> sp0s{}; - std::span<int, 10> sp1s{iArr2, 10}; - std::span<int, 2> sp2s{iArr2 + 3, 2}; - std::span<int, 2> sp3s{iArr2 + 1, 2}; - std::span<int, 2> sp4s{iArr2 + 6, 2}; - - assert(!(sp0d != sp0d)); - assert(!(sp0s != sp0s)); - assert(!(sp0s != sp0d)); - assert(!(sp0d != sp0s)); - - assert( (sp0d != sp1d)); - assert( (sp0s != sp1s)); - assert( (sp0s != sp1d)); - assert( (sp0d != sp1s)); - - assert(!(sp1d != sp1s)); - assert(!(sp1s != sp1d)); - - assert(!(sp2d != sp3d)); - assert(!(sp2s != sp3s)); - assert(!(sp2d != sp3s)); - assert(!(sp2s != sp3d)); - - assert(!(sp2d != sp3d)); - assert(!(sp2s != sp3s)); - assert(!(sp2d != sp3s)); - assert(!(sp2s != sp3d)); - - assert( (sp2d != sp4d)); - assert( (sp2s != sp4s)); - assert( (sp2d != sp4s)); - assert( (sp2s != sp4d)); - - assert( (sp4d != sp2d)); - assert( (sp4s != sp2s)); - assert( (sp4d != sp2s)); - assert( (sp4s != sp2d)); - -// cross type comparisons - assert(!(csp0d != sp0d)); - assert(!(csp0s != sp0s)); - assert(!(csp0s != sp0d)); - assert(!(csp0d != sp0s)); - - assert( (csp0d != sp1d)); - assert( (csp0s != sp1s)); - assert( (csp0s != sp1d)); - assert( (csp0d != sp1s)); - - assert(!(csp1d != sp1s)); - assert(!(csp1s != sp1d)); - - assert(!(csp2d != sp3d)); - assert(!(csp2s != sp3s)); - assert(!(csp2d != sp3s)); - assert(!(csp2s != sp3d)); - - assert(!(csp2d != sp3d)); - assert(!(csp2s != sp3s)); - assert(!(csp2d != sp3s)); - assert(!(csp2s != sp3d)); - - assert( (csp2d != sp4d)); - assert( (csp2s != sp4s)); - assert( (csp2d != sp4s)); - assert( (csp2s != sp4d)); - - assert( (csp4d != sp2d)); - assert( (csp4s != sp2s)); - assert( (csp4d != sp2s)); - assert( (csp4s != sp2d)); - -// More cross-type comparisons (int vs float) - static_assert(!(std::span<const float>{fArr1} != std::span<const int>{iArr1}), ""); - static_assert(!(std::span<const int>{iArr1} != std::span<const float>{fArr1}), ""); - assert(!(std::span<float>{fArr2} != std::span<int>{iArr2})); - assert(!(std::span<int>{iArr2} != std::span<float>{fArr2})); - - static_assert( (std::span<const int>{iArr1, 9} != std::span<const float>{fArr1, 8}), ""); -} diff --git a/libcxx/www/cxx2a_status.html b/libcxx/www/cxx2a_status.html index 7c8c8319597..090f3cb9e0f 100644 --- a/libcxx/www/cxx2a_status.html +++ b/libcxx/www/cxx2a_status.html @@ -127,7 +127,7 @@ <tr><td><a href="https://wg21.link/P1007R3">P1007R3</a></td><td>LWG</td><td><tt>std::assume_aligned</tt></td><td>San Diego</td><td><i> </i></td><td></td></tr> <tr><td><a href="https://wg21.link/P1020R1">P1020R1</a></td><td>LWG</td><td>Smart pointer creation with default initialization</td><td>San Diego</td><td><i> </i></td><td></td></tr> <tr><td><a href="https://wg21.link/P1032R1">P1032R1</a></td><td>LWG</td><td>Misc constexpr bits</td><td>San Diego</td><td><i> </i></td><td></td></tr> - <tr><td><a href="https://wg21.link/P1085R2">P1085R2</a></td><td>LWG</td><td>Should Span be Regular?</td><td>San Diego</td><td><i> </i></td><td></td></tr> + <tr><td><a href="https://wg21.link/P1085R2">P1085R2</a></td><td>LWG</td><td>Should Span be Regular?</td><td>San Diego</td><td>Complete</td><td>8.0</td></tr> <tr><td><a href="https://wg21.link/P1123R0">P1123R0</a></td><td>LWG</td><td>Editorial Guidance for merging P0019r8 and P0528r3</td><td>San Diego</td><td><i> </i></td><td></td></tr> <tr><td><a href="https://wg21.link/P1148R0">P1148R0</a></td><td>LWG</td><td>Cleaning up Clause 20</td><td>San Diego</td><td><i> </i></td><td></td></tr> <tr><td><a href="https://wg21.link/P1165R1">P1165R1</a></td><td>LWG</td><td>Make stateful allocator propagation more consistent for <tt>operator+(basic_string)</tt></td><td>San Diego</td><td><i> </i></td><td></td></tr> @@ -291,7 +291,7 @@ <!-- <tr><td></td><td></td><td></td><td></td></tr> --> </table> - <p>Last Updated: 18-Nov-2018</p> + <p>Last Updated: 27-Nov-2018</p> </div> </body> </html> |
