24 changes: 12 additions & 12 deletions libcxx/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ int main()
{
typedef X T;
typedef optional<T> O;

constexpr T val(2);
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
constexpr O o3{val}; // engaged

static_assert ( o1 < T(1) , "" );
static_assert ( !(o2 < T(1)), "" );
static_assert ( (o1 < T(1)), "" );
static_assert ( !(o2 < T(1)), "" ); // equal
static_assert ( !(o3 < T(1)), "" );
static_assert ( o2 < T(2) , "" );
static_assert ( o2 < T(val), "" );
static_assert ( o3 < T(3) , "" );
static_assert ( (o2 < val), "" );
static_assert ( !(o3 < val), "" ); // equal
static_assert ( (o3 < T(3)), "" );

static_assert ( !(T(1) < o1), "" );
static_assert ( !(T(1) < o2), "" );
static_assert ( T(1) < o3 , "" );
static_assert ( !(T(2) < o2), "" );
static_assert (!(T(val) < o2), "" );
static_assert ( !(T(1) < o2), "" ); // equal
static_assert ( (T(1) < o3), "" );
static_assert ( !(val < o2), "" );
static_assert ( !(val < o3), "" ); // equal
static_assert ( !(T(3) < o3), "" );
}
#endif
Expand Down
58 changes: 58 additions & 0 deletions libcxx/test/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//

// <optional>

// template <class T> constexpr bool operator!=(const optional<T>& x, const T& v);
// template <class T> constexpr bool operator!=(const T& v, const optional<T>& x);

#include <experimental/optional>

#if _LIBCPP_STD_VER > 11

using std::experimental::optional;

struct X
{
int i_;

constexpr X(int i) : i_(i) {}
};

constexpr bool operator == ( const X &lhs, const X &rhs )
{ return lhs.i_ == rhs.i_ ; }

#endif

int main()
{
#if _LIBCPP_STD_VER > 11
{
typedef X T;
typedef optional<T> O;

constexpr T val(2);
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged
constexpr O o3{val}; // engaged

static_assert ( (o1 != T(1)), "" );
static_assert ( !(o2 != T(1)), "" );
static_assert ( (o3 != T(1)), "" );
static_assert ( !(o3 != T(2)), "" );
static_assert ( !(o3 != val), "" );

static_assert ( (T(1) != o1), "" );
static_assert ( !(T(1) != o2), "" );
static_assert ( (T(1) != o3), "" );
static_assert ( !(T(2) != o3), "" );
static_assert ( !(val != o3), "" );
}
#endif
}
4 changes: 2 additions & 2 deletions .../optional/optional.nullops/eqaul.pass.cpp → .../optional/optional.nullops/equal.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ int main()
constexpr O o1; // disengaged
constexpr O o2{1}; // engaged

static_assert ( nullopt == o1 , "" );
static_assert ( (nullopt == o1), "" );
static_assert ( !(nullopt == o2), "" );
static_assert ( o1 == nullopt , "" );
static_assert ( (o1 == nullopt), "" );
static_assert ( !(o2 == nullopt), "" );

static_assert (noexcept(nullopt == o1), "");
Expand Down
41 changes: 41 additions & 0 deletions libcxx/test/utilities/optional/optional.nullops/greater.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//


// <optional>

// template <class T> constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept;
// template <class T> constexpr bool operator>(nullopt_t, const optional<T>& x) noexcept;

#include <experimental/optional>

int main()
{
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;

{
typedef int T;
typedef optional<T> O;

constexpr O o1; // disengaged
constexpr O o2{1}; // engaged

static_assert ( !(nullopt > o1), "" );
static_assert ( !(nullopt > o2), "" );
static_assert ( !(o1 > nullopt), "" );
static_assert ( (o2 > nullopt), "" );

static_assert (noexcept(nullopt > o1), "");
static_assert (noexcept(o1 > nullopt), "");
}
#endif
}
41 changes: 41 additions & 0 deletions libcxx/test/utilities/optional/optional.nullops/greater_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//


// <optional>

// template <class T> constexpr bool operator>=(const optional<T>& x, nullopt_t) noexcept;
// template <class T> constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept;

#include <experimental/optional>

int main()
{
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;

{
typedef int T;
typedef optional<T> O;

constexpr O o1; // disengaged
constexpr O o2{1}; // engaged

static_assert ( (nullopt >= o1), "" );
static_assert ( !(nullopt >= o2), "" );
static_assert ( (o1 >= nullopt), "" );
static_assert ( (o2 >= nullopt), "" );

static_assert (noexcept(nullopt >= o1), "");
static_assert (noexcept(o1 >= nullopt), "");
}
#endif
}
41 changes: 41 additions & 0 deletions libcxx/test/utilities/optional/optional.nullops/less_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//


// <optional>

// template <class T> constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept;
// template <class T> constexpr bool operator<=(nullopt_t, const optional<T>& x) noexcept;

#include <experimental/optional>

int main()
{
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;

{
typedef int T;
typedef optional<T> O;

constexpr O o1; // disengaged
constexpr O o2{1}; // engaged

static_assert ( (nullopt <= o1), "" );
static_assert ( (nullopt <= o2), "" );
static_assert ( (o1 <= nullopt), "" );
static_assert ( !(o2 <= nullopt), "" );

static_assert (noexcept(nullopt <= o1), "");
static_assert (noexcept(o1 <= nullopt), "");
}
#endif
}
2 changes: 1 addition & 1 deletion libcxx/test/utilities/optional/optional.nullops/less_than.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ int main()
constexpr O o2{1}; // engaged

static_assert ( !(nullopt < o1), "" );
static_assert ( nullopt < o2 , "" );
static_assert ( (nullopt < o2), "" );
static_assert ( !(o1 < nullopt), "" );
static_assert ( !(o2 < nullopt), "" );

Expand Down
41 changes: 41 additions & 0 deletions libcxx/test/utilities/optional/optional.nullops/not_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//


// <optional>

// template <class T> constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept;
// template <class T> constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept;

#include <experimental/optional>

int main()
{
#if _LIBCPP_STD_VER > 11
using std::experimental::optional;
using std::experimental::nullopt_t;
using std::experimental::nullopt;

{
typedef int T;
typedef optional<T> O;

constexpr O o1; // disengaged
constexpr O o2{1}; // engaged

static_assert ( !(nullopt != o1), "" );
static_assert ( (nullopt != o2), "" );
static_assert ( !(o1 != nullopt), "" );
static_assert ( (o2 != nullopt), "" );

static_assert (noexcept(nullopt != o1), "");
static_assert (noexcept(o1 != nullopt), "");
}
#endif
}
75 changes: 75 additions & 0 deletions libcxx/test/utilities/optional/optional.relops/greater_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//

// <optional>

// template <class T> constexpr bool operator>= (const optional<T>& x, const optional<T>& y);

#include <experimental/optional>

#if _LIBCPP_STD_VER > 11

using std::experimental::optional;

struct X
{
int i_;

constexpr X(int i) : i_(i) {}
};

constexpr bool operator < ( const X &lhs, const X &rhs )
{ return lhs.i_ < rhs.i_ ; }

#endif

int main()
{
#if _LIBCPP_STD_VER > 11
{
typedef optional<X> O;

constexpr O o1; // disengaged
constexpr O o2; // disengaged
constexpr O o3{1}; // engaged
constexpr O o4{2}; // engaged
constexpr O o5{1}; // engaged

static_assert ( (o1 >= o1), "" );
static_assert ( (o1 >= o2), "" );
static_assert ( !(o1 >= o3), "" );
static_assert ( !(o1 >= o4), "" );
static_assert ( !(o1 >= o5), "" );

static_assert ( (o2 >= o1), "" );
static_assert ( (o2 >= o2), "" );
static_assert ( !(o2 >= o3), "" );
static_assert ( !(o2 >= o4), "" );
static_assert ( !(o2 >= o5), "" );

static_assert ( (o3 >= o1), "" );
static_assert ( (o3 >= o2), "" );
static_assert ( (o3 >= o3), "" );
static_assert ( !(o3 >= o4), "" );
static_assert ( (o3 >= o5), "" );

static_assert ( (o4 >= o1), "" );
static_assert ( (o4 >= o2), "" );
static_assert ( (o4 >= o3), "" );
static_assert ( (o4 >= o4), "" );
static_assert ( (o4 >= o5), "" );

static_assert ( (o5 >= o1), "" );
static_assert ( (o5 >= o2), "" );
static_assert ( (o5 >= o3), "" );
static_assert ( !(o5 >= o4), "" );
static_assert ( (o5 >= o5), "" );
}
#endif
}
75 changes: 75 additions & 0 deletions libcxx/test/utilities/optional/optional.relops/greater_than.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//

// <optional>

// template <class T> constexpr bool operator> (const optional<T>& x, const optional<T>& y);

#include <experimental/optional>

#if _LIBCPP_STD_VER > 11

using std::experimental::optional;

struct X
{
int i_;

constexpr X(int i) : i_(i) {}
};

constexpr bool operator < ( const X &lhs, const X &rhs )
{ return lhs.i_ < rhs.i_ ; }

#endif

int main()
{
#if _LIBCPP_STD_VER > 11
{
typedef optional<X> O;

constexpr O o1; // disengaged
constexpr O o2; // disengaged
constexpr O o3{1}; // engaged
constexpr O o4{2}; // engaged
constexpr O o5{1}; // engaged

static_assert ( !(o1 > o1), "" );
static_assert ( !(o1 > o2), "" );
static_assert ( !(o1 > o3), "" );
static_assert ( !(o1 > o4), "" );
static_assert ( !(o1 > o5), "" );

static_assert ( !(o2 > o1), "" );
static_assert ( !(o2 > o2), "" );
static_assert ( !(o2 > o3), "" );
static_assert ( !(o2 > o4), "" );
static_assert ( !(o2 > o5), "" );

static_assert ( (o3 > o1), "" );
static_assert ( (o3 > o2), "" );
static_assert ( !(o3 > o3), "" );
static_assert ( !(o3 > o4), "" );
static_assert ( !(o3 > o5), "" );

static_assert ( (o4 > o1), "" );
static_assert ( (o4 > o2), "" );
static_assert ( (o4 > o3), "" );
static_assert ( !(o4 > o4), "" );
static_assert ( (o4 > o5), "" );

static_assert ( (o5 > o1), "" );
static_assert ( (o5 > o2), "" );
static_assert ( !(o5 > o3), "" );
static_assert ( !(o5 > o4), "" );
static_assert ( !(o5 > o5), "" );
}
#endif
}
75 changes: 75 additions & 0 deletions libcxx/test/utilities/optional/optional.relops/less_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//

// <optional>

// template <class T> constexpr bool operator<= (const optional<T>& x, const optional<T>& y);

#include <experimental/optional>

#if _LIBCPP_STD_VER > 11

using std::experimental::optional;

struct X
{
int i_;

constexpr X(int i) : i_(i) {}
};

constexpr bool operator < ( const X &lhs, const X &rhs )
{ return lhs.i_ < rhs.i_ ; }

#endif

int main()
{
#if _LIBCPP_STD_VER > 11
{
typedef optional<X> O;

constexpr O o1; // disengaged
constexpr O o2; // disengaged
constexpr O o3{1}; // engaged
constexpr O o4{2}; // engaged
constexpr O o5{1}; // engaged

static_assert ( (o1 <= o1), "" );
static_assert ( (o1 <= o2), "" );
static_assert ( (o1 <= o3), "" );
static_assert ( (o1 <= o4), "" );
static_assert ( (o1 <= o5), "" );

static_assert ( (o2 <= o1), "" );
static_assert ( (o2 <= o2), "" );
static_assert ( (o2 <= o3), "" );
static_assert ( (o2 <= o4), "" );
static_assert ( (o2 <= o5), "" );

static_assert ( !(o3 <= o1), "" );
static_assert ( !(o3 <= o2), "" );
static_assert ( (o3 <= o3), "" );
static_assert ( (o3 <= o4), "" );
static_assert ( (o3 <= o5), "" );

static_assert ( !(o4 <= o1), "" );
static_assert ( !(o4 <= o2), "" );
static_assert ( !(o4 <= o3), "" );
static_assert ( (o4 <= o4), "" );
static_assert ( !(o4 <= o5), "" );

static_assert ( !(o5 <= o1), "" );
static_assert ( !(o5 <= o2), "" );
static_assert ( (o5 <= o3), "" );
static_assert ( (o5 <= o4), "" );
static_assert ( (o5 <= o5), "" );
}
#endif
}
16 changes: 8 additions & 8 deletions libcxx/test/utilities/optional/optional.relops/less_than.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ int main()

static_assert ( !(o1 < o1), "" );
static_assert ( !(o1 < o2), "" );
static_assert ( o1 < o3 , "" );
static_assert ( o1 < o4 , "" );
static_assert ( o1 < o5 , "" );
static_assert ( (o1 < o3), "" );
static_assert ( (o1 < o4), "" );
static_assert ( (o1 < o5), "" );

static_assert ( !(o2 < o1), "" );
static_assert ( !(o2 < o2), "" );
static_assert ( o2 < o3 , "" );
static_assert ( o2 < o4 , "" );
static_assert ( o2 < o5 , "" );
static_assert ( (o2 < o3), "" );
static_assert ( (o2 < o4), "" );
static_assert ( (o2 < o5), "" );

static_assert ( !(o3 < o1), "" );
static_assert ( !(o3 < o2), "" );
static_assert ( !(o3 < o3), "" );
static_assert ( o3 < o4 , "" );
static_assert ( (o3 < o4), "" );
static_assert ( !(o3 < o5), "" );

static_assert ( !(o4 < o1), "" );
Expand All @@ -68,7 +68,7 @@ int main()
static_assert ( !(o5 < o1), "" );
static_assert ( !(o5 < o2), "" );
static_assert ( !(o5 < o3), "" );
static_assert ( o5 < o4 , "" );
static_assert ( (o5 < o4), "" );
static_assert ( !(o5 < o5), "" );
}
#endif
Expand Down
79 changes: 79 additions & 0 deletions libcxx/test/utilities/optional/optional.relops/not_equal.pass.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
//===----------------------------------------------------------------------===//
//
// 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.
//
//===----------------------------------------------------------------------===//

// <optional>

// template <class T> constexpr bool operator!=(const optional<T>& x, const optional<T>& y);

#include <experimental/optional>
#include <type_traits>
#include <cassert>

#if _LIBCPP_STD_VER > 11

using std::experimental::optional;

struct X
{
int i_;

constexpr X(int i) : i_(i) {}
};

constexpr bool operator == ( const X &lhs, const X &rhs )
{ return lhs.i_ == rhs.i_ ; }

#endif

int main()
{
#if _LIBCPP_STD_VER > 11
{
typedef X T;
typedef optional<T> O;

constexpr O o1; // disengaged
constexpr O o2; // disengaged
constexpr O o3{1}; // engaged
constexpr O o4{2}; // engaged
constexpr O o5{1}; // engaged

static_assert ( !(o1 != o1), "" );
static_assert ( !(o1 != o2), "" );
static_assert ( (o1 != o3), "" );
static_assert ( (o1 != o4), "" );
static_assert ( (o1 != o5), "" );

static_assert ( !(o2 != o1), "" );
static_assert ( !(o2 != o2), "" );
static_assert ( (o2 != o3), "" );
static_assert ( (o2 != o4), "" );
static_assert ( (o2 != o5), "" );

static_assert ( (o3 != o1), "" );
static_assert ( (o3 != o2), "" );
static_assert ( !(o3 != o3), "" );
static_assert ( (o3 != o4), "" );
static_assert ( !(o3 != o5), "" );

static_assert ( (o4 != o1), "" );
static_assert ( (o4 != o2), "" );
static_assert ( (o4 != o3), "" );
static_assert ( !(o4 != o4), "" );
static_assert ( (o4 != o5), "" );

static_assert ( (o5 != o1), "" );
static_assert ( (o5 != o2), "" );
static_assert ( !(o5 != o3), "" );
static_assert ( (o5 != o4), "" );
static_assert ( !(o5 != o5), "" );

}
#endif
}