use double-conversion from google instead of locale depend functions

Dushistov · Apr 27, 2016 · 115fc76 · 115fc76
1 parent 2ba84bc
commit 115fc76
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "double-conversion"]
+	path = double-conversion
+	url = https://github.com/google/double-conversion
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,15 +3,18 @@ project(json11 VERSION 1.0.0 LANGUAGES CXX)
 
 enable_testing()
 
+add_subdirectory(double-conversion)
+include_directories(double-conversion)
 add_library(json11 json11.cpp)
 target_include_directories(json11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_options(json11
   PUBLIC -std=c++11
   PRIVATE -fno-rtti -fno-exceptions -Wall -Wextra -Werror)
+target_link_libraries(json11 double-conversion)
 configure_file("json11.pc.in" "json11.pc" @ONLY)
 
 add_executable(json11_test test.cpp)
-target_link_libraries(json11_test json11)
+target_link_libraries(json11_test json11 double-conversion)
 
 install(TARGETS json11 DESTINATION lib)
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include)

diff --git a/double-conversion b/double-conversion
diff --git a/json11.cpp b/json11.cpp
@@ -26,6 +26,8 @@
 #include <cstdio>
 #include <limits>
 
+#include "double-conversion/double-conversion.h"
+
 namespace json11 {
 
 static const int max_depth = 200;
@@ -47,9 +49,13 @@ static void dump(std::nullptr_t, string &out) {
 
 static void dump(double value, string &out) {
     if (std::isfinite(value)) {
+        const double_conversion::DoubleToStringConverter &dc = double_conversion::DoubleToStringConverter::EcmaScriptConverter();
         char buf[32];
-        snprintf(buf, sizeof buf, "%.17g", value);
-        out += buf;
+        double_conversion::StringBuilder str_builder(buf, sizeof(buf));
+        dc.ToShortest(value, &str_builder);
+//        dc.ToFixed(value, 17, &str_builder);
+//        snprintf(buf, sizeof buf, "%.17g", value);
+        out += str_builder.Finalize();
     } else {
         out += "null";
     }
@@ -608,8 +614,12 @@ struct JsonParser {
             while (in_range(str[i], '0', '9'))
                 i++;
         }
+        using double_conversion::StringToDoubleConverter;
 
-        return std::strtod(str.c_str() + start_pos, nullptr);
+        StringToDoubleConverter double_conv{StringToDoubleConverter::NO_FLAGS, 0., 0., "Infinity", "NaN",};
+        int processed_characters_count;
+        return double_conv.StringToDouble(&str[start_pos], i - start_pos, &processed_characters_count);
+//        return std::strtod(str.c_str() + start_pos, nullptr);
     }
 
     /* expect(str, res)

diff --git a/test.cpp b/test.cpp
@@ -46,7 +46,7 @@ int main(int argc, char **argv) {
     }
 
     const string simple_test =
-        R"({"k1":"v1", "k2":42, "k3":["a",123,true,false,null]})";
+        R"({"k1":"v1", "k2":42.1, "k3":["a",123,true,false,null]})";
 
     string err;
     auto json = Json::parse(simple_test, err);
@@ -151,7 +151,7 @@ int main(int argc, char **argv) {
     // Json literals
     Json obj = Json::object({
         { "k1", "v1" },
-        { "k2", 42.0 },
+        { "k2", 42.1 },
         { "k3", Json::array({ "a", 123.0, true, false, nullptr }) },
     });