Fix #88 - Support display for std::optional

jfalcou · Nov 8, 2023 · b0558ee · b0558ee
1 parent f6633a2
commit b0558ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/include/tts/tools/as_string.hpp b/include/tts/tools/as_string.hpp
@@ -9,6 +9,7 @@
 
 #include <iomanip>
 #include <sstream>
+#include <optional>
 #include <type_traits>
 #include <tts/tools/concepts.hpp>
 #include <tts/tools/typename.hpp>
@@ -125,4 +126,11 @@ namespace tts
   inline std::string as_string(std::string const& e)      { return  e;                          }
   inline std::string as_string(std::string_view const& e) { return  std::string(e);             }
   inline std::string as_string(std::nullptr_t)            { return  std::string("nullptr");     }
+
+  template<typename T>
+  std::string as_string(std::optional<T> const& o)
+  {
+    if(o) return  std::string("optional<") + typename_<T> +">{" + as_string(*o) + "}";
+    else  return  std::string("optional<") + typename_<T> + ">{}";
+  }
 }
diff --git a/standalone/tts/tts.hpp b/standalone/tts/tts.hpp
@@ -990,6 +990,7 @@ namespace tts::detail
 }
 #include <iomanip>
 #include <sstream>
+#include <optional>
 #include <type_traits>
 namespace tts
 {
@@ -1052,6 +1053,12 @@ namespace tts
   inline std::string as_string(std::string const& e)      { return  e;                          }
   inline std::string as_string(std::string_view const& e) { return  std::string(e);             }
   inline std::string as_string(std::nullptr_t)            { return  std::string("nullptr");     }
+  template<typename T>
+  std::string as_string(std::optional<T> const& o)
+  {
+    if(o) return  std::string("optional<") + typename_<T> +">{" + as_string(*o) + "}";
+    else  return  std::string("optional<") + typename_<T> + ">{}";
+  }
 }
 #define TTS_RELATION_BASE(A, B, OP, T, F, FAILURE)                                                \
 if( ::tts::detail::OP(a,b) )                                                                      \

diff --git a/test/display.cpp b/test/display.cpp
@@ -78,3 +78,10 @@ TTS_CASE( "Check display of sequence type" )
             , "{ some_type[13] some_type[34] }"s
             );
 };
+
+
+TTS_CASE( "Check display of std::optional" )
+{
+  TTS_EQUAL(tts::as_string( std::optional{42} )   , "optional<int>{42}"s );
+  TTS_EQUAL(tts::as_string( std::optional<int>{} ), "optional<int>{}"s   );
+};