llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-22 16:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update the changes to the array tests (that I committed yesterday) to use the test_comparison routines that I committed last week. NFC.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@338797 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2018-08-03 00:47:12 +00:00
parent 88f5d7a38b
commit 3a225ef042
1 changed files with 8 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
test/std/containers/sequences/array/compare.pass.cpp
View File

@@ -23,59 +23,12 @@
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "test_comparisons.h"
// std::array is explicitly allowed to be initialized with A a = { init-list };. // std::array is explicitly allowed to be initialized with A a = { init-list };.
// Disable the missing braces warning for this reason. // Disable the missing braces warning for this reason.
#include "disable_missing_braces_warning.h" #include "disable_missing_braces_warning.h"
template <class Array>
void test_compare(const Array& LHS, const Array& RHS) {
typedef std::vector<typename Array::value_type> Vector;
const Vector LHSV(LHS.begin(), LHS.end());
const Vector RHSV(RHS.begin(), RHS.end());
assert((LHS == RHS) == (LHSV == RHSV));
assert((LHS != RHS) == (LHSV != RHSV));
assert((LHS < RHS) == (LHSV < RHSV));
assert((LHS <= RHS) == (LHSV <= RHSV));
assert((LHS > RHS) == (LHSV > RHSV));
assert((LHS >= RHS) == (LHSV >= RHSV));
}
#if TEST_STD_VER > 17
template <class Array>
constexpr bool constexpr_compare(const Array &lhs, const Array &rhs, bool isEqual, bool isLess)
{
if (isEqual)
{
if (!(lhs == rhs)) return false;
if ( (lhs != rhs)) return false;
if ( (lhs < rhs)) return false;
if (!(lhs <= rhs)) return false;
if ( (lhs > rhs)) return false;
if (!(lhs >= rhs)) return false;
}
else if (isLess)
{
if ( (lhs == rhs)) return false;
if (!(lhs != rhs)) return false;
if (!(lhs < rhs)) return false;
if (!(lhs <= rhs)) return false;
if ( (lhs > rhs)) return false;
if ( (lhs >= rhs)) return false;
}
else // greater
{
if ( (lhs == rhs)) return false;
if (!(lhs != rhs)) return false;
if ( (lhs < rhs)) return false;
if ( (lhs <= rhs)) return false;
if (!(lhs > rhs)) return false;
if (!(lhs >= rhs)) return false;
}
return true;
}
#endif
int main() int main()
{ {
{ {
@@ -85,25 +38,25 @@ int main()
C c2 = {1, 2, 3}; C c2 = {1, 2, 3};
C c3 = {3, 2, 1}; C c3 = {3, 2, 1};
C c4 = {1, 2, 1}; C c4 = {1, 2, 1};
test_compare(c1, c2); assert(testComparisons6(c1, c2, true, false));
test_compare(c1, c3); assert(testComparisons6(c1, c3, false, true));
test_compare(c1, c4); assert(testComparisons6(c1, c4, false, false));
} }
{ {
typedef int T; typedef int T;
typedef std::array<T, 0> C; typedef std::array<T, 0> C;
C c1 = {}; C c1 = {};
C c2 = {}; C c2 = {};
test_compare(c1, c2); assert(testComparisons6(c1, c2, true, false));
} }
#if TEST_STD_VER > 17 #if TEST_STD_VER > 17
{ {
constexpr std::array<int, 3> a1 = {1, 2, 3}; constexpr std::array<int, 3> a1 = {1, 2, 3};
constexpr std::array<int, 3> a2 = {2, 3, 4}; constexpr std::array<int, 3> a2 = {2, 3, 4};
static_assert(constexpr_compare(a1, a1, true, false), ""); static_assert(testComparisons6(a1, a1, true, false), "");
static_assert(constexpr_compare(a1, a2, false, true), ""); static_assert(testComparisons6(a1, a2, false, true), "");
static_assert(constexpr_compare(a2, a1, false, false), ""); static_assert(testComparisons6(a2, a1, false, false), "");
} }
#endif #endif
} }