From ceb54da5cd93262e282d45fe3b60c0bf1a7835c8 Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Thu, 30 Sep 2021 12:23:43 +0200
Subject: Fixed compact binary to JSON float/double format specifier.

---
 zencore/compactbinary.cpp | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'zencore/compactbinary.cpp')

diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index 3b6d33e41..4072ab5cf 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -1474,10 +1474,10 @@ public:
 				Builder << Accessor.AsIntegerNegative();
 				break;
 			case CbFieldType::Float32:
-				Builder.Append("%.9g"_format(Accessor.AsFloat32()));
+				Builder.Append("{:.9g}"_format(Accessor.AsFloat32()));
 				break;
 			case CbFieldType::Float64:
-				Builder.Append("%.17g"_format(Accessor.AsFloat64()));
+				Builder.Append("{:.17g}"_format(Accessor.AsFloat64()));
 				break;
 			case CbFieldType::BoolFalse:
 				Builder << "false"sv;
@@ -1831,6 +1831,31 @@ TEST_CASE("uson.json")
 		CHECK(ValueOne == "ValueOne");
 		CHECK(ValueTwo == "ValueTwo");
 	}
+
+	SUBCASE("number")
+	{
+		const double ExpectedFloatValue	 = 21.21f;
+		const double ExpectedDoubleValue = 42.42;
+
+		CbObjectWriter Writer;
+		Writer << "Float" << ExpectedFloatValue;
+		Writer << "Double" << ExpectedDoubleValue;
+
+		CbObject Obj = Writer.Save();
+
+		StringBuilder<128>	   Sb;
+		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+
+		std::string	 JsonError;
+		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+
+		const float	 FloatValue	 = float(Json["Float"].number_value());
+		const double DoubleValue = Json["Double"].number_value();
+
+		CHECK(JsonError.empty());
+		CHECK(FloatValue == doctest::Approx(ExpectedFloatValue));
+		CHECK(DoubleValue == doctest::Approx(ExpectedDoubleValue));
+	}
 }
 #endif
 
-- 
cgit v1.2.3