Feat/optimize

include/common/array.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <initializer_list>

include/common/exception.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <exception>

include/common/object.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <initializer_list>

include/common/serialization.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <type_traits>
@@ -13,8 +15,8 @@ template <typename in_t, typename serializer_t>
 class is_serializable
 {
     template <typename U>
-    static auto
-        test(int) -> decltype(std::declval<serializer_t>()(std::declval<U>()), std::true_type());
+    static auto test(int)
+        -> decltype(std::declval<serializer_t>()(std::declval<U>()), std::true_type());
 
     template <typename U>
     static std::false_type test(...);

include/common/types.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include "array.hpp"

include/common/utils.hpp

@@ -1,5 +1,10 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
+#include <iomanip>
+#include <limits>
+#include <sstream>
 #include <string>
 #include <type_traits>
 
@@ -163,7 +168,7 @@ class has_from_json_in_templ_spec
 };
 
 template <typename string_t>
-static constexpr string_t unescape_string(const string_t& str)
+inline constexpr string_t unescape_string(const string_t& str)
 {
     using char_t = typename string_t::value_type;
 
@@ -211,26 +216,41 @@ static constexpr string_t unescape_string(const string_t& str)
 }
 
 template <typename string_t>
-static constexpr string_t true_string()
+inline constexpr string_t true_string()
 {
     return { 't', 'r', 'u', 'e' };
 }
 
 template <typename string_t>
-static constexpr string_t false_string()
+inline constexpr string_t false_string()
 {
     return { 'f', 'a', 'l', 's', 'e' };
 }
 
 template <typename string_t>
-static constexpr string_t null_string()
+inline constexpr string_t null_string()
 {
     return { 'n', 'u', 'l', 'l' };
 }
 
 template <typename string_t, typename any_t>
-string_t to_basic_string(any_t&& arg)
+inline string_t to_basic_string(any_t&& arg)
 {
+#ifdef MEOJSON_KEEP_FLOATING_PRECISION
+    using real_type = std::remove_reference_t<any_t>;
+    if constexpr (std::is_floating_point_v<real_type>) {
+        if constexpr (std::is_same_v<string_t, std::string>) {
+            std::ostringstream oss;
+            oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
+            return oss.str();
+        }
+        else if constexpr (std::is_same_v<string_t, std::wstring>) {
+            std::wostringstream oss;
+            oss << std::setprecision(std::numeric_limits<real_type>::max_digits10) << arg;
+            return oss.str();
+        }
+    }
+#endif
     if constexpr (std::is_same_v<string_t, std::string>) {
         return std::to_string(std::forward<any_t>(arg));
     }

include/common/value.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <cstddef>
@@ -611,16 +613,16 @@ inline auto basic_value<string_t>::get_helper(
 {
     if constexpr (std::is_constructible_v<string_t, first_key_t>) {
         return is_object() ? as_object().get_helper(
-                                 default_value,
-                                 std::forward<first_key_t>(first),
-                                 std::forward<rest_keys_t>(rest)...)
+                   default_value,
+                   std::forward<first_key_t>(first),
+                   std::forward<rest_keys_t>(rest)...)
                            : default_value;
     }
     else if constexpr (std::is_integral_v<std::decay_t<first_key_t>>) {
         return is_array() ? as_array().get_helper(
-                                default_value,
-                                std::forward<first_key_t>(first),
-                                std::forward<rest_keys_t>(rest)...)
+                   default_value,
+                   std::forward<first_key_t>(first),
+                   std::forward<rest_keys_t>(rest)...)
                           : default_value;
     }
     else {

include/json.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
+// IWYU pragma: begin_exports
+
 #include "common/serialization.hpp"
 #include "common/types.hpp"
 #include "parser/parser.hpp"
 #include "reflection/jsonization.hpp"
+
+// IWYU pragma: end_exports

include/json5.hpp

@@ -1,4 +1,8 @@
 #pragma once
 
+// IWYU pragma: begin_exports
+
 #include "common/types.hpp"
 #include "parser5/parser5.hpp"
+
+// IWYU pragma: end_exports

include/parser/bitops.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #if __cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)

include/parser/packed_bytes.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <cstdint>

include/parser/packed_bytes_arm.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 // current NEON implementation doesn't outperform 64-bit scalar implementation

include/parser/packed_bytes_x86.hpp

@@ -1,4 +1,7 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
+
 #include "packed_bytes.hpp"
 
 #include <emmintrin.h>

include/parser/parser.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <fstream>

include/parser5/parser5.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json5.hpp>
+
 #pragma once
 
 #include <algorithm>

include/parser5/unicode.h

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json5.hpp>
+
 // This is a generated file. Do not edit.
 #pragma once
 #include <array>

include/reflection/jsonization.hpp

@@ -1,3 +1,5 @@
+// IWYU pragma: private, include <meojson/json.hpp>
+
 #pragma once
 
 #include <string>

test/main.cpp

@@ -2,6 +2,7 @@
 
 #include "include_test.h"
 #include "json5_test.h"
+#include "precision_test.h"
 #include "serializing_test.h"
 
 int main()
@@ -23,6 +24,9 @@ int main()
     std::cout << "\n*** json5_test ***\n" << std::endl;
     success &= test_json5();
 
+    std::cout << "\n*** precision_test ***\n" << std::endl;
+    success &= precision_test();
+
     if (!success) {
         std::cout << "\n****** Test failed ******\n" << std::endl;
         return -1;

test/precision_test.cpp

@@ -0,0 +1,18 @@
+#define MEOJSON_KEEP_FLOATING_PRECISION
+
+#include "../include/json.hpp"
+
+#include <iomanip>
+#include <iostream>
+
+bool precision_test()
+{
+    double value = 3.141592653589793;
+    json::object obj_old = json::object { { "double", value } };
+    std::string obj_str = obj_old.to_string();
+    std::cout << obj_str << std::endl;
+    json::object obj_new = json::parse(obj_str).value().as_object();
+    std::cout << "old:" << std::hexfloat << value << std::endl;
+    std::cout << "new:" << std::hexfloat << obj_new.at("double").as_double() << std::endl;
+    return obj_new.at("double").as_double() == value;
+}

test/precision_test.h

@@ -0,0 +1,3 @@
+#pragma once
+
+extern bool precision_test();