diff --git a/include/span b/include/span index ea7aecb58..cebe98760 100644 --- a/include/span +++ b/include/span @@ -23,20 +23,6 @@ inline constexpr ptrdiff_t dynamic_extent = -1; template class span; -// [span.comparison], span comparison operators -template - constexpr bool operator==(span l, span r); -template - constexpr bool operator!=(span l, span r); -template - constexpr bool operator<(span l, span r); -template - constexpr bool operator<=(span l, span r); -template - constexpr bool operator>(span l, span r); -template - constexpr bool operator>=(span l, span r); - // [span.objectrep], views of object representation template span - constexpr bool - operator==(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return equal(__lhs.begin(), __lhs.end(), __rhs.begin(), __rhs.end()); } - -template - constexpr bool - operator!=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__rhs == __lhs); } - -template - 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 - constexpr bool - operator<=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__rhs < __lhs); } - -template - constexpr bool - operator> (const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return __rhs < __lhs; } - -template - constexpr bool - operator>=(const span<_Tp1, _Extent1>& __lhs, const span<_Tp2, _Extent2>& __rhs) - { return !(__lhs < __rhs); } - // as_bytes & as_writeable_bytes template auto as_bytes(span<_Tp, _Extent> __s) noexcept diff --git a/test/std/containers/views/span.comparison/op.eq.pass.cpp b/test/std/containers/views/span.comparison/op.eq.pass.cpp deleted file mode 100644 index 353f4aeef..000000000 --- a/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 - -// - -// template -// constexpr bool operator==(span l, span r); -// -// -// Effects: Equivalent to: return equal(l.begin(), l.end(), r.begin(), r.end()); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1} == std::span{iArr1}, ""); - static_assert(std::span{iArr1} == std::span{fArr1}, ""); - assert(std::span{fArr2} == std::span{iArr2}); - assert(std::span{iArr2} == std::span{fArr2}); - - static_assert(!(std::span{iArr1, 9} == std::span{fArr1, 8}), ""); -} diff --git a/test/std/containers/views/span.comparison/op.ge.pass.cpp b/test/std/containers/views/span.comparison/op.ge.pass.cpp deleted file mode 100644 index 65c2a85da..000000000 --- a/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 - -// - -// template -// constexpr bool operator>=(span l, span r); -// -// -// Effects: Equivalent to: return !(l < r); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1, 8} >= std::span{iArr1, 9}), ""); - static_assert(!(std::span{iArr1, 8} >= std::span{fArr1, 9}), ""); - assert( (std::span{fArr2} >= std::span{iArr2})); - assert( (std::span{iArr2} >= std::span{fArr2})); - - static_assert( (std::span{iArr1, 9} >= std::span{fArr1, 8}), ""); -} diff --git a/test/std/containers/views/span.comparison/op.gt.pass.cpp b/test/std/containers/views/span.comparison/op.gt.pass.cpp deleted file mode 100644 index 396d5a21b..000000000 --- a/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 - -// - -// template -// constexpr bool operator>(span l, span r); -// -// -// Effects: Equivalent to: return (r < l); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1, 8} > std::span{iArr1, 9}), ""); - static_assert(!(std::span{iArr1, 8} > std::span{fArr1, 9}), ""); - assert(!(std::span{fArr2} > std::span{iArr2})); - assert(!(std::span{iArr2} > std::span{fArr2})); - - static_assert( (std::span{iArr1, 9} > std::span{fArr1, 8}), ""); -} diff --git a/test/std/containers/views/span.comparison/op.le.pass.cpp b/test/std/containers/views/span.comparison/op.le.pass.cpp deleted file mode 100644 index 420410c46..000000000 --- a/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 - -// - -// template -// constexpr bool operator<=(span l, span r); -// -// -// Effects: Equivalent to: return !(r < l); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1, 8} <= std::span{iArr1, 9}, ""); - static_assert(std::span{iArr1, 8} <= std::span{fArr1, 9}, ""); - assert( (std::span{fArr2} <= std::span{iArr2})); - assert( (std::span{iArr2} <= std::span{fArr2})); - - static_assert(!(std::span{iArr1, 9} <= std::span{fArr1, 8}), ""); -} diff --git a/test/std/containers/views/span.comparison/op.lt.pass.cpp b/test/std/containers/views/span.comparison/op.lt.pass.cpp deleted file mode 100644 index 0ccc2446e..000000000 --- a/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 - -// - -// template -// constexpr bool operator<(span l, span r); -// -// -// Effects: Equivalent to: -// return lexicographical_compare(l.begin(), l.end(), r.begin(), r.end()); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1, 8} < std::span{iArr1, 9}, ""); - static_assert(std::span{iArr1, 8} < std::span{fArr1, 9}, ""); - assert(!(std::span{fArr2} < std::span{iArr2})); - assert(!(std::span{iArr2} < std::span{fArr2})); - - static_assert(!(std::span{iArr1, 9} < std::span{fArr1, 8}), ""); -} diff --git a/test/std/containers/views/span.comparison/op.ne.pass.cpp b/test/std/containers/views/span.comparison/op.ne.pass.cpp deleted file mode 100644 index 117d1d067..000000000 --- a/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 - -// - -// template -// constexpr bool operator!=(span l, span r); -// -// -// Effects: Equivalent to: return !(l == r); -// - -#include -#include - -#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 csp0d{}; - constexpr std::span csp1d{iArr1, 10}; - constexpr std::span csp2d{iArr1 + 3, 2}; - constexpr std::span csp3d{iArr1 + 1, 2}; - constexpr std::span csp4d{iArr1 + 6, 2}; - - constexpr std::span csp0s{}; - constexpr std::span csp1s{iArr1, 10}; - constexpr std::span csp2s{iArr1 + 3, 2}; - constexpr std::span csp3s{iArr1 + 1, 2}; - constexpr std::span 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 sp0d{}; - std::span sp1d{iArr2, 10}; - std::span sp2d{iArr2 + 3, 2}; - std::span sp3d{iArr2 + 1, 2}; - std::span sp4d{iArr2 + 6, 2}; - - std::span sp0s{}; - std::span sp1s{iArr2, 10}; - std::span sp2s{iArr2 + 3, 2}; - std::span sp3s{iArr2 + 1, 2}; - std::span 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{fArr1} != std::span{iArr1}), ""); - static_assert(!(std::span{iArr1} != std::span{fArr1}), ""); - assert(!(std::span{fArr2} != std::span{iArr2})); - assert(!(std::span{iArr2} != std::span{fArr2})); - - static_assert( (std::span{iArr1, 9} != std::span{fArr1, 8}), ""); -} diff --git a/www/cxx2a_status.html b/www/cxx2a_status.html index 7c8c83195..090f3cb9e 100644 --- a/www/cxx2a_status.html +++ b/www/cxx2a_status.html @@ -127,7 +127,7 @@ P1007R3LWGstd::assume_alignedSan Diego P1020R1LWGSmart pointer creation with default initializationSan Diego P1032R1LWGMisc constexpr bitsSan Diego - P1085R2LWGShould Span be Regular?San Diego + P1085R2LWGShould Span be Regular?San DiegoComplete8.0 P1123R0LWGEditorial Guidance for merging P0019r8 and P0528r3San Diego P1148R0LWGCleaning up Clause 20San Diego P1165R1LWGMake stateful allocator propagation more consistent for operator+(basic_string)San Diego @@ -291,7 +291,7 @@ -

Last Updated: 18-Nov-2018

+

Last Updated: 27-Nov-2018