integer_from_json -> to_integer_unchecked

Author: danielaparker

include/jsoncons/detail/parse_number.hpp

@@ -28,7 +28,7 @@ namespace jsoncons { namespace detail {
     public:
         const char* name() const noexcept override
         {
-            return "jsoncons/integer_from_json";
+            return "jsoncons/to_integer_unchecked";
         }
         std::string message(int ev) const override
         {
@@ -39,7 +39,7 @@ namespace jsoncons { namespace detail {
                 case to_integer_errc::invalid_digit:
                     return "Invalid digit";
                 default:
-                    return "Unknown integer_from_json error";
+                    return "Unknown to_integer_unchecked error";
             }
         }
     };
@@ -514,7 +514,7 @@ to_integer(const CharT* s, std::size_t length)
 
 template <class T, class CharT>
 typename std::enable_if<std::is_integral<T>::value && !std::is_signed<T>::value,to_integer_result<T>>::type
-integer_from_json(const CharT* s, std::size_t length)
+to_integer_unchecked(const CharT* s, std::size_t length)
 {
     static_assert(std::numeric_limits<T>::is_specialized, "Integer type not specialized");
     JSONCONS_ASSERT(length > 0);
@@ -575,7 +575,7 @@ integer_from_json(const CharT* s, std::size_t length)
 
 template <class T, class CharT>
 typename std::enable_if<std::is_integral<T>::value && std::is_signed<T>::value,to_integer_result<T>>::type
-integer_from_json(const CharT* s, std::size_t length)
+to_integer_unchecked(const CharT* s, std::size_t length)
 {
     static_assert(std::numeric_limits<T>::is_specialized, "Integer type not specialized");
     JSONCONS_ASSERT(length > 0);

include/jsoncons/json_parser.hpp

@@ -2579,7 +2579,7 @@ class basic_json_parser : public ser_context
 
     void end_negative_value(basic_json_visitor<CharT>& visitor, std::error_code& ec)
     {
-        auto result = jsoncons::detail::integer_from_json<int64_t>(string_buffer_.data(), string_buffer_.length());
+        auto result = jsoncons::detail::to_integer_unchecked<int64_t>(string_buffer_.data(), string_buffer_.length());
         if (result)
         {
             more_ = visitor.int64_value(result.value(), semantic_tag::none, *this, ec);
@@ -2593,7 +2593,7 @@ class basic_json_parser : public ser_context
 
     void end_positive_value(basic_json_visitor<CharT>& visitor, std::error_code& ec)
     {
-        auto result = jsoncons::detail::integer_from_json<uint64_t>(string_buffer_.data(), string_buffer_.length());
+        auto result = jsoncons::detail::to_integer_unchecked<uint64_t>(string_buffer_.data(), string_buffer_.length());
         if (result)
         {
             more_ = visitor.uint64_value(result.value(), semantic_tag::none, *this, ec);

tests/src/json_as_tests.cpp

@@ -102,7 +102,7 @@ TEST_CASE("json::as<__int128>()")
 {
     std::string s = "-18446744073709551617";
 
-    jsoncons::detail::to_integer_result<__int128> result = jsoncons::detail::integer_from_json<__int128>(s.data(),s.size());
+    jsoncons::detail::to_integer_result<__int128> result = jsoncons::detail::to_integer_unchecked<__int128>(s.data(),s.size());
     REQUIRE(result);
 
     jsoncons::json j(s);
@@ -115,7 +115,7 @@ TEST_CASE("json::as<unsigned __int128>()")
 {
     std::string s = "18446744073709551616";
 
-    jsoncons::detail::to_integer_result<unsigned __int128> result = jsoncons::detail::integer_from_json<unsigned __int128>(s.data(),s.size());
+    jsoncons::detail::to_integer_result<unsigned __int128> result = jsoncons::detail::to_integer_unchecked<unsigned __int128>(s.data(),s.size());
     REQUIRE(result);
 
     jsoncons::json j(s);