try_encode

Author: danielaparker

include/jsoncons/basic_json.hpp

@@ -4718,7 +4718,7 @@ namespace jsoncons {
             }
         }
 
-        expected<void,std::error_code> try_dump_noflush(basic_json_visitor<char_type>& visitor, std::error_code& ec) const
+        expected<void,std::error_code> try_dump_noflush(basic_json_visitor<char_type>& visitor) const
         {
             std::error_code ec;
             const ser_context context{};
@@ -4769,20 +4769,36 @@ namespace jsoncons {
                     {
                         visitor.key(string_view_type(((*it).key()).data(),(*it).key().length()), context, ec);
                         (*it).value().dump_noflush(visitor, ec);
+                        if (JSONCONS_UNLIKELY(ec))
+                        {
+                            return expected<void,std::error_code>{unexpect, ec};
+                        }
                     }
                     visitor.end_object(context, ec);
-                    return ec ? expected<void,std::error_code>{unexpect, ec} : expected<void,std::error_code>{};
+                    if (JSONCONS_UNLIKELY(ec))
+                    {
+                        return expected<void,std::error_code>{unexpect, ec};
+                    }
+                    return expected<void,std::error_code>{};
                 }
                 case json_storage_kind::array:
                 {
                     visitor.begin_array(size(), tag(), context, ec);
                     const array& o = cast<array_storage>().value();
                     for (const_array_iterator it = o.begin(); it != o.end(); ++it)
                     {
-                        (*it).dump_noflush(visitor, ec);
+                        auto r = (*it).try_dump_noflush(visitor);
+                        if (JSONCONS_UNLIKELY(!r))
+                        {
+                            return r;
+                        }
                     }
                     visitor.end_array(context, ec);
-                    return ec ? expected<void,std::error_code>{unexpect, ec} : expected<void,std::error_code>{};
+                    if (JSONCONS_UNLIKELY(ec))
+                    {
+                        return expected<void,std::error_code>{unexpect, ec};
+                    }
+                    return expected<void,std::error_code>{};
                 }
                 case json_storage_kind::json_const_ref:
                     return cast<json_const_reference_storage>().value().try_dump_noflush(visitor);

include/jsoncons/encode_json.hpp

@@ -201,10 +201,9 @@ try_encode_json(const allocator_set<Alloc,TempAlloc>& aset,
 template <typename T,typename CharT>
 expected<void,std::error_code> try_encode_json(const T& val, basic_json_visitor<CharT>& encoder)
 {
-    std::error_code ec;
-    reflect::encode_traits<T>::try_encode(make_alloc_set(), val, encoder, ec);
+    auto r = reflect::encode_traits<T>::try_encode(make_alloc_set(), val, encoder);
     encoder.flush();
-    return ec ? expected<void, std::error_code>{jsoncons::unexpect, ec} : expected<void, std::error_code>{};
+    return r;
 }
 
 // encode_json_pretty

include/jsoncons/reflect/decode_traits.hpp

@@ -58,6 +58,7 @@ struct decode_traits
         {
             return result_type(jsoncons::unexpect, r1.error().code(), r1.error().message_arg(), line, column);
         }
+        std::cout << "try_decode: " << *r1 << "\n";
         auto r2 = (*r1).template try_as<T>(aset);
         if (JSONCONS_UNLIKELY(!r2))
         {