message_arg -> msg_arg

Author: danielaparker

doc/ref/corelib/conversion_error.md

@@ -12,7 +12,7 @@ class conversion_error;
     std::error_code code() const noexcept;
 Returns an error code.
 
-    const std::string& message_arg() const noexcept
+    const std::string& msg_arg() const noexcept
 Returns an explanatory string
 
     std::string message() const;

doc/ref/corelib/read_error.md

@@ -12,7 +12,7 @@ class read_error;
     std::error_code code() const noexcept;
 Returns an error code.
 
-    const std::string& message_arg() const noexcept
+    const std::string& msg_arg() const noexcept
 Returns an explanatory string
 
     std::size_t line() const noexcept

include/jsoncons/basic_json.hpp

@@ -3538,7 +3538,7 @@ namespace jsoncons {
             auto r = reflect::json_conv_traits<basic_json,T>::try_as(make_alloc_set(), *this);
             if (!r)
             {
-                JSONCONS_THROW(conv_error(r.error().code(), r.error().message_arg()));
+                JSONCONS_THROW(conv_error(r.error().code(), r.error().msg_arg()));
             }
             return std::move(r.value());
         }
@@ -3550,7 +3550,7 @@ namespace jsoncons {
             auto r = reflect::json_conv_traits<basic_json,T>::try_as(aset, *this);
             if (!r)
             {
-                JSONCONS_THROW(conv_error(r.error().code(), r.error().message_arg()));
+                JSONCONS_THROW(conv_error(r.error().code(), r.error().msg_arg()));
             }
             return std::move(r.value());
         }

include/jsoncons/conversion_result.hpp

@@ -44,7 +44,7 @@ class conversion_error
         return ec_;
     }
 
-    const std::string& message_arg() const 
+    const std::string& msg_arg() const 
     {
         return message_arg_;
     }

include/jsoncons/decode_json.hpp

@@ -260,7 +260,7 @@ T decode_json(Args&& ... args)
     auto result = try_decode_json<T>(std::forward<Args>(args)...); 
     if (!result)
     {
-        JSONCONS_THROW(ser_error(result.error().code(), result.error().message_arg(), result.error().line(), result.error().column()));
+        JSONCONS_THROW(ser_error(result.error().code(), result.error().msg_arg(), result.error().line(), result.error().column()));
     }
     return std::move(*result);
 }

include/jsoncons/reflect/decode_traits.hpp

@@ -56,12 +56,12 @@ struct decode_traits
             cursor);
         if (JSONCONS_UNLIKELY(!r1))
         {
-            return result_type(jsoncons::unexpect, r1.error().code(), r1.error().message_arg(), line, column);
+            return result_type(jsoncons::unexpect, r1.error().code(), r1.error().msg_arg(), line, column);
         }
         auto r2 = (*r1).template try_as<T>(aset);
         if (JSONCONS_UNLIKELY(!r2))
         {
-            return result_type(jsoncons::unexpect, r2.error().code(), r2.error().message_arg(), line, column);
+            return result_type(jsoncons::unexpect, r2.error().code(), r2.error().msg_arg(), line, column);
         }
         return result_type(std::move(*r2));
     }

include/jsoncons/reflect/json_conv_traits.hpp

@@ -585,7 +585,7 @@ has_can_convert = ext_traits::is_detected<traits_can_convert_t, Json, T>;
                 auto res = item.template try_as<value_type>(aset);
                 if (JSONCONS_UNLIKELY(!res))
                 {
-                    return result_type(jsoncons::unexpect, res.error().code(), res.error().message_arg());
+                    return result_type(jsoncons::unexpect, res.error().code(), res.error().msg_arg());
                 }
                 result.push_back(std::move(*res));
             }
@@ -918,7 +918,7 @@ has_can_convert = ext_traits::is_detected<traits_can_convert_t, Json, T>;
                 auto r2 = item.value().template try_as<mapped_type>(aset);
                 if (!r2)
                 {
-                    return result_type(jsoncons::unexpect, r2.error().code(), r2.error().message_arg());
+                    return result_type(jsoncons::unexpect, r2.error().code(), r2.error().msg_arg());
                 }
                 val.emplace(std::move(key), std::move(*r2));
             }

include/jsoncons/reflect/reflect_traits_gen.hpp

@@ -35,24 +35,22 @@ inline
 std::string generate_msg_arg(const char* class_name, const char* s)
 {
     std::string str;
-    str.push_back('\"');
     str.append(class_name);
     str.push_back(':');
+    str.push_back(':');
     str.append(s);
-    str.push_back('\"');
     return str;
 }
 
 inline
 std::string generate_msg_arg(const char* class_name, const wchar_t* s)
 {
     std::string str;
-    str.push_back('\"');
     str.append(class_name);
     str.push_back(':');
+    str.push_back(':');
     std::size_t len = std::char_traits<wchar_t>::length(s);
     jsoncons::unicode_traits::convert(s, len, str);
-    str.push_back('\"');
     return str;
 }
 
@@ -804,9 +802,9 @@ namespace reflect { \
 #define JSONCONS_ALL_MEMBER_NAME_AS_7(Member, Name, Mode, Match, Into, From) { \
   auto it = ajson.find(Name); \
   if (it == ajson.object_range().end()) \
-    {return result_type(unexpect, conv_errc::missing_required_member, class_name);} \
+    {return result_type(unexpect, conv_errc::missing_required_member, error_context<value_type>::msg_arg(index));} \
   auto result = json_traits_helper<Json>::template try_as_value<typename std::decay<decltype(Into(class_instance.Member))>::type>(aset, it->value()); \
-  if (result && !Match(From(* result))) {return result_type(jsoncons::unexpect, conv_errc::conversion_failed, class_name);} \
+  if (result && !Match(From(* result))) {return result_type(jsoncons::unexpect, conv_errc::conversion_failed, error_context<value_type>::msg_arg(index));} \
   Mode(JSONCONS_ALL_MEMBER_NAME_AS_8(Member, Name, Mode, Match, Into, From)) }
 
 #define JSONCONS_ALL_MEMBER_NAME_AS_8(Member, Name, Mode, Match, Into, From) \
@@ -843,7 +841,7 @@ else \
 #define JSONCONS_GENERATE_MSG_ARG_NAME_3(Member, Name, Mode) JSONCONS_GENERATE_MSG_ARG_NAME_6(Member, Name,Mode,,,)
 #define JSONCONS_GENERATE_MSG_ARG_NAME_4(Member, Name, Mode, Match) JSONCONS_GENERATE_MSG_ARG_NAME_6(Member, Name, Mode, Match,,)
 #define JSONCONS_GENERATE_MSG_ARG_NAME_5(Member, Name, Mode, Match, Into) JSONCONS_GENERATE_MSG_ARG_NAME_6(Member, Name, Mode, Match, Into, )
-#define JSONCONS_GENERATE_MSG_ARG_NAME_6(Member, Name, Mode, Match, Into, From) generate_msg_arg(class_name, Name),
+#define JSONCONS_GENERATE_MSG_ARG_NAME_6(Member, Name, Mode, Match, Into, From) generate_msg_arg(class_name, # Member),
 
 #define JSONCONS_N_MEMBER_NAME_DECODE
 

include/jsoncons/ser_utils.hpp

@@ -86,7 +86,7 @@ class read_error
     {
         return ec_;
     }
-    const std::string& message_arg() const noexcept
+    const std::string& msg_arg() const noexcept
     {
         return message_arg_;
     }

include/jsoncons_ext/toon/decode_toon.hpp

@@ -152,7 +152,7 @@ T decode_toon(Args&& ... args)
     auto result = try_decode_toon<T>(std::forward<Args>(args)...); 
     if (!result)
     {
-        JSONCONS_THROW(ser_error(result.error().code(), result.error().message_arg(), result.error().line(), result.error().column()));
+        JSONCONS_THROW(ser_error(result.error().code(), result.error().msg_arg(), result.error().line(), result.error().column()));
     }
     return std::move(*result);
 }