refinements

Author: zajo

include/boost/leaf/common.hpp

@@ -62,10 +62,8 @@ struct e_errno
     template <class Json>
     friend void to_json(Json & j, e_errno const & e)
     {
-        char zstr[256];
-        Json & v = j[parse_to_zstr<e_errno>(zstr)];
-        v["value"] = e.value;
-        v["message"] = std::strerror(e.value);
+        j["value"] = e.value;
+        j["message"] = std::strerror(e.value);
     }
 };
 

include/boost/leaf/detail/demangle.hpp

@@ -19,6 +19,10 @@
 #include <cstdlib>
 #include <cstring>
 
+#if BOOST_LEAF_CFG_STD_STRING
+#   include <string>
+#endif
+
 #if BOOST_LEAF_CFG_DIAGNOSTICS
 
 // __has_include is currently supported by GCC and Clang. However GCC 4.9 may have issues and
@@ -131,6 +135,13 @@ namespace n
         {
             return os.write(pn.name, pn.len);
         }
+
+#if BOOST_LEAF_CFG_STD_STRING
+        friend std::string to_string(r const & pn)
+        {
+            return std::string(pn.name, pn.len);
+        }
+#endif
     };
 
     template <class T>
@@ -217,16 +228,6 @@ parsed parse()
     return n::p<T>();
 }
 
-template <class T, int N>
-char const * parse_to_zstr(char (&zstr)[N]) noexcept
-{
-    parsed p = parse<T>();
-    std::size_t n = p.len < N - 1 ? p.len : N - 1;
-    std::memcpy(zstr, p.name, n);
-    zstr[n] = '\0';
-    return zstr;
-}
-
 } } // namespace boost::leaf
 
 ////////////////////////////////////////

include/boost/leaf/diagnostics.hpp

@@ -61,7 +61,10 @@ class diagnostic_info: public error_info
     void write_to(W & w) const
     {
         typename detail::dependent_writer<W>::type & wr = w;
-        serialize(wr, error());
+#ifndef BOOST_LEAF_NO_EXCEPTIONS
+        if( exception() )
+            serialize(wr, *exception());
+#endif
         serialize_tuple_contents_(wr, tup_, error());
     }
 }; // class diagnostic_info
@@ -121,7 +124,10 @@ class diagnostic_info: public error_info
     void write_to(W & w) const
     {
         typename detail::dependent_writer<W>::type & wr = w;
-        serialize(wr, error());
+#ifndef BOOST_LEAF_NO_EXCEPTIONS
+        if( exception() )
+            serialize(wr, *exception());
+#endif
     }
 }; // class diagnostic_info
 

include/boost/leaf/error.hpp

@@ -79,11 +79,9 @@ struct e_source_location
     template <class Json>
     friend void to_json(Json & j, e_source_location const & x)
     {
-        char zstr[256];
-        Json & v = j[parse_to_zstr<e_source_location>(zstr)];
-        v["file"] = x.file;
-        v["line"] = x.line;
-        v["function"] = x.function;
+        j["file"] = x.file;
+        j["line"] = x.line;
+        j["function"] = x.function;
     }
 };
 
@@ -807,12 +805,6 @@ class error_id
         return os << (x.value_ / 4);
     }
 
-    template <class Json>
-    friend void to_json(Json & j, error_id x)
-    {
-        j["serial number"] = x.value_ / 4;
-    }
-
     BOOST_LEAF_CONSTEXPR void load_source_location_( char const * file, int line, char const * function ) const noexcept(!BOOST_LEAF_CFG_CAPTURE)
     {
         BOOST_LEAF_ASSERT(file&&*file);

include/boost/leaf/serialize.hpp

@@ -30,16 +30,27 @@ struct show_in_diagnostics: std::true_type
 
 class writer
 {
-    virtual parsed type() const noexcept = 0;
+    parsed const type_;
 
 protected:
-    ~writer() noexcept { }
+
+    template <class Derived>
+    explicit writer(Derived * d) noexcept:
+        type_(parse<Derived>())
+    {
+        BOOST_LEAF_ASSERT(d == this), (void) d;
+    }
+
+    ~writer() noexcept
+    {
+    }
 
 public:
-    template <class W>
-    W * check_type(parsed tid) noexcept
+
+    template <class Derived>
+    Derived * get() noexcept
     {
-        return type() == tid ? static_cast<W *>(this) : nullptr;
+        return type_ == parse<typename std::decay<Derived>::type>() ? static_cast<Derived *>(this) : nullptr;
     }
 };
 
@@ -86,11 +97,6 @@ class ostream_writer: public writer
     char const * & prefix_;
     char const * const delimiter_;
 
-    parsed type() const noexcept override
-    {
-        return parse<ostream_writer>();
-    }
-
     template <class T, class CharT, class Traits>
     static void print_name(std::basic_ostream<CharT, Traits> & os, char const * & prefix, char const * delimiter)
     {
@@ -135,7 +141,9 @@ class ostream_writer: public writer
     struct diagnostic;
 
 public:
+
     ostream_writer(std::ostream & os, char const * & prefix, char const * delimiter) noexcept:
+        writer(this),
         os_(os),
         prefix_(prefix),
         delimiter_(delimiter)
@@ -152,7 +160,7 @@ class ostream_writer: public writer
 template <class Writer, class E>
 void serialize(Writer & w, E const & e)
 {
-    if( ostream_writer * ow = w.template check_type<ostream_writer>(parse<ostream_writer>()) )
+    if( ostream_writer * ow = w.template get<ostream_writer>() )
         ow->write(e);
 }
 
@@ -228,54 +236,63 @@ struct ostream_writer::diagnostic<Enum, true, false, false, false, true>
 template <class Json, class E>
 auto to_json(Json & j, E const & e) -> decltype(to_json(j, e.value), void())
 {
-    char zstr[256];
-    j[parse_to_zstr<E>(zstr)] = e.value;
+    j["value"] = e.value;
 }
 
 #if BOOST_LEAF_CFG_STD_SYSTEM_ERROR
 template <class Json>
 void to_json(Json & j, std::error_code const & ec)
 {
-    Json & v = j["std::error_code"];
-    v["category"] = ec.category().name();
-    v["value"] = ec.value();
-    v["message"] = ec.message();
+    j["category"] = ec.category().name();
+    j["value"] = ec.value();
+    j["message"] = ec.message();
+}
+#endif
+
+#ifndef BOOST_LEAF_NO_EXCEPTIONS
+template <class Json>
+void to_json(Json & j, std::exception const & ex)
+{
+    j["typeid.name"] = detail::demangler(typeid(ex).name()).get();
+    if( char const * w = ex.what() )
+        j["what"] = w;
+    else
+        j["what"] = "<<nullptr>>";
 }
 #endif
 
 template <class Json>
 void to_json(Json & j, std::exception_ptr const & ep)
 {
-    Json & v = j["std::exception_ptr"];
     if( ep )
     {
 #ifdef BOOST_LEAF_NO_EXCEPTIONS
-        v["typeid.name"] = "<<unknown>>";
-        v["what"] = "N/A";
+        j["typeid.name"] = "<<unknown>>";
+        j["what"] = "N/A";
 #else
         try
         {
             std::rethrow_exception(ep);
         }
         catch( std::exception const & ex )
         {
-            v["typeid.name"] = detail::demangler(typeid(ex).name()).get();
+            j["typeid.name"] = detail::demangler(typeid(ex).name()).get();
             if( char const * w = ex.what() )
-                v["what"] = w;
+                j["what"] = w;
             else
-                v["what"] = "<<nullptr>>";
+                j["what"] = "<<nullptr>>";
         }
         catch( ... )
         {
-            v["typeid.name"] = "<<unknown>>";
-            v["what"] = "N/A";
+            j["typeid.name"] = "<<unknown>>";
+            j["what"] = "N/A";
         }
 #endif
     }
     else
     {
-        v["typeid.name"] = "<<empty>>";
-        v["what"] = "N/A";
+        j["typeid.name"] = "<<empty>>";
+        j["what"] = "N/A";
     }
 }