From 7a2b207a90a0721479c51905eaf6c64f15835d8c Mon Sep 17 00:00:00 2001
From: Simon Brand <simon@codeplay.com>
Date: Mon, 2 Oct 2017 14:20:01 +0100
Subject: [PATCH] More static require

---
 tests/monadic.cpp | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/monadic.cpp b/tests/monadic.cpp
index 9f10f9e..a6041e4 100644
--- a/tests/monadic.cpp
+++ b/tests/monadic.cpp
@@ -1,18 +1,24 @@
 #include "catch.hpp"
 #include "optional.hpp"
-template <class> struct TC;
+
+#define TOKENPASTE(x, y) x##y
+#define TOKENPASTE2(x, y) TOKENPASTE(x, y)
+#define STATIC_REQUIRE(e)                                                      \
+  constexpr bool TOKENPASTE2(rqure, __LINE__) = e;                             \
+  REQUIRE(e);
+
 // What is Clang Format up to?!
 TEST_CASE("Monadic operations",
           "[monadic]"){SECTION("map"){// lhs is empty
                                       tl::optional<int> o1;
 auto o1r = o1.map([](int i) { return i + 2; });
-static_assert(std::is_same<decltype(o1r), tl::optional<int>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o1r), tl::optional<int>>::value));
 REQUIRE(!o1r);
 
 // lhs has value
 tl::optional<int> o2 = 40;
 auto o2r = o2.map([](int i) { return i + 2; });
-static_assert(std::is_same<decltype(o2r), tl::optional<int>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o2r), tl::optional<int>>::value));
 REQUIRE(o2r.value() == 42);
 
 struct rval_call_map {
@@ -22,33 +28,33 @@ struct rval_call_map {
 // ensure that function object is forwarded
 tl::optional<int> o3 = 42;
 auto o3r = o3.map(rval_call_map{});
-static_assert(std::is_same<decltype(o3r), tl::optional<double>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o3r), tl::optional<double>>::value));
 REQUIRE(o3r.value() == 42);
 
 // ensure that lhs is forwarded
 tl::optional<int> o4 = 40;
 auto o4r = std::move(o4).map([](int &&i) { return i + 2; });
-static_assert(std::is_same<decltype(o4r), tl::optional<int>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o4r), tl::optional<int>>::value));
 REQUIRE(o4r.value() == 42);
 
 // ensure that lhs is const-propagated
 const tl::optional<int> o5 = 40;
 auto o5r = o5.map([](const int &i) { return i + 2; });
-static_assert(std::is_same<decltype(o5r), tl::optional<int>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o5r), tl::optional<int>>::value));
 REQUIRE(o5r.value() == 42);
 
 // test applicative functor
 tl::optional<int> o6 = 40;
 auto f6 = tl::make_optional([](const int &i) { return i + 2; });
 auto o6r = o6.map(f6);
-static_assert(std::is_same<decltype(o6r), tl::optional<int>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o6r), tl::optional<int>>::value));
 REQUIRE(o6r.value() == 42);
 
 // test void return
 tl::optional<int> o7 = 40;
 auto f7 = tl::make_optional([](const int &i) { return; });
 auto o7r = o7.map(f7);
-static_assert(std::is_same<decltype(o7r), tl::optional<tl::monostate>>::value);
+STATIC_REQUIRE((std::is_same<decltype(o7r), tl::optional<tl::monostate>>::value));
 REQUIRE(o6r.has_value());
 }
 
@@ -57,25 +63,25 @@ SECTION("bind") {
   // lhs is empty
   tl::optional<int> o1;
   auto o1r = o1.bind([](int i) { return tl::optional<float>{42}; });
-  static_assert(std::is_same<decltype(o1r), tl::optional<float>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o1r), tl::optional<float>>::value));
   REQUIRE(!o1r);
 
   // lhs has value
   tl::optional<int> o2 = 12;
   auto o2r = o2.bind([](int i) { return tl::optional<float>{42}; });
-  static_assert(std::is_same<decltype(o2r), tl::optional<float>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o2r), tl::optional<float>>::value));
   REQUIRE(o2r.value() == 42.f);
 
   // lhs is empty, rhs returns empty
   tl::optional<int> o3;
   auto o3r = o3.bind([](int i) { return tl::optional<float>{}; });
-  static_assert(std::is_same<decltype(o3r), tl::optional<float>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o3r), tl::optional<float>>::value));
   REQUIRE(!o3r);
 
   // rhs returns empty
   tl::optional<int> o4 = 12;
   auto o4r = o4.bind([](int i) { return tl::optional<float>{}; });
-  static_assert(std::is_same<decltype(o4r), tl::optional<float>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o4r), tl::optional<float>>::value));
   REQUIRE(!o4r);
 
   struct rval_call_bind {
@@ -85,20 +91,20 @@ SECTION("bind") {
   // ensure that function object is forwarded
   tl::optional<int> o5 = 42;
   auto o5r = o5.bind(rval_call_bind{});
-  static_assert(std::is_same<decltype(o5r), tl::optional<double>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o5r), tl::optional<double>>::value));
   REQUIRE(o5r.value() == 42);
 
   // ensure that lhs is forwarded
   tl::optional<int> o6 = 42;
   auto o6r =
       std::move(o6).bind([](int &&i) { return tl::optional<double>(i); });
-  static_assert(std::is_same<decltype(o6r), tl::optional<double>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o6r), tl::optional<double>>::value));
   REQUIRE(o6r.value() == 42);
 
   // ensure that function object is const-propagated
   const tl::optional<int> o7 = 42;
   auto o7r = o7.bind([](const int &i) { return tl::optional<double>(i); });
-  static_assert(std::is_same<decltype(o7r), tl::optional<double>>::value);
+  STATIC_REQUIRE((std::is_same<decltype(o7r), tl::optional<double>>::value));
   REQUIRE(o7r.value() == 42);
 }
 }