Augment json_type_traits errors with member name

danielaparker · Sep 22, 2023 · afbfc32 · afbfc32
1 parent 8efb52b
commit afbfc32
Showing 1 changed file with 41 additions and 4 deletions.
diff --git a/include/jsoncons/json_traits_macros.hpp b/include/jsoncons/json_traits_macros.hpp
@@ -87,22 +87,59 @@ namespace jsoncons
         template <class U> 
         static void set_optional_json_member(const string_view_type& key, const std::shared_ptr<U>& val, Json& j) 
         { 
-            if (val) j.try_emplace(key, val); 
+            if (val) 
+            {
+                try
+                {
+                    j.try_emplace(key, val);
+                }
+                catch (const std::exception& e)
+                {
+                    JSONCONS_THROW(json_runtime_error<std::runtime_error>(append_key_to_message(e.what(), key)));
+                }
+            }
         } 
         template <class U> 
         static void set_optional_json_member(const string_view_type& key, const std::unique_ptr<U>& val, Json& j) 
         { 
-            if (val) j.try_emplace(key, val); 
+            if (val) 
+            {
+                try
+                {
+                    j.try_emplace(key, val);
+                }
+                catch (const std::exception& e)
+                {
+                    JSONCONS_THROW(json_runtime_error<std::runtime_error>(append_key_to_message(e.what(), key)));
+                }
+            }
         } 
         template <class U> 
         static void set_optional_json_member(const string_view_type& key, const jsoncons::optional<U>& val, Json& j) 
         { 
-            if (val) j.try_emplace(key, val); 
+            if (val) 
+            {
+                try
+                {
+                    j.try_emplace(key, val);
+                }
+                catch (const std::exception& e)
+                {
+                    JSONCONS_THROW(json_runtime_error<std::runtime_error>(append_key_to_message(e.what(), key)));
+                }
+            }
         } 
         template <class U> 
         static void set_optional_json_member(const string_view_type& key, const U& val, Json& j) 
         { 
-            j.try_emplace(key, val); 
+            try
+            {
+                j.try_emplace(key, val); 
+            }
+            catch (const std::exception& e)
+            {
+                JSONCONS_THROW(json_runtime_error<std::runtime_error>(append_key_to_message(e.what(), key)));
+            }
         } 
     };
 }