Augment json_type_traits errors with member name

danielaparker · Sep 22, 2023 · 8efb52b · 8efb52b
1 parent a414677
commit 8efb52b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/include/jsoncons/json_exception.hpp b/include/jsoncons/json_exception.hpp
@@ -228,6 +228,21 @@ namespace jsoncons {
     #endif
     };
 
+template <class CharT>
+std::string append_key_to_message(const std::string& message, const jsoncons::basic_string_view<CharT>& key)
+{
+    std::string s(message);
+    s.append(": ");
+    JSONCONS_TRY
+    {
+        unicode_traits::convert(key.data(), key.length(), s, unicode_traits::conv_flags::strict);
+    }
+    JSONCONS_CATCH(...)
+    {
+    }
+    return s;
+}
+
 #if !defined(JSONCONS_NO_DEPRECATED)
 JSONCONS_DEPRECATED_MSG("Instead, use ser_error") typedef ser_error serialization_error;
 JSONCONS_DEPRECATED_MSG("Instead, use ser_error") typedef ser_error json_parse_exception;

diff --git a/include/jsoncons/json_traits_macros.hpp b/include/jsoncons/json_traits_macros.hpp
@@ -58,7 +58,14 @@ namespace jsoncons
         template <class OutputType> 
         static void set_udt_member(const Json& j, const string_view_type& key, OutputType& val) 
         { 
-            val = j.at(key).template as<OutputType>(); 
+            try
+            {
+                val = j.at(key).template as<OutputType>(); 
+            }
+            catch (const std::exception& e)
+            {
+                JSONCONS_THROW(json_runtime_error<std::runtime_error>(append_key_to_message(e.what(), key)));
+            }
         } 
 
         template <class T, class From, class OutputType> 
@@ -68,7 +75,14 @@ namespace jsoncons
         template <class T, class From, class OutputType> 
         static void set_udt_member(const Json& j, const string_view_type& key, From from, OutputType& val) 
         { 
-            val = from(j.at(key).template as<T>()); 
+            try
+            {
+                val = from(j.at(key).template as<T>()); 
+            }
+            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::shared_ptr<U>& val, Json& j)