generic-library/rapidjson
1
0
Fork 0
mirror of https://github.com/Tencent/rapidjson.git synced 2025-03-10 12:21:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #291 from miloyip/issue289_NegativeZeroRoundtrip

Browse Source 
Fix #289 negative zero roundtrip (double only)
This commit is contained in:
Milo Yip 2015-04-10 21:53:58 +08:00
commit 02aa12a29e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rapidjson/internal/dtoa.h
View File

@ -21,6 +21,7 @@
#include "itoa.h" // GetDigitsLut() #include "itoa.h" // GetDigitsLut()
#include "diyfp.h" #include "diyfp.h"
#include "ieee754.h"
RAPIDJSON_NAMESPACE_BEGIN RAPIDJSON_NAMESPACE_BEGIN
namespace internal { namespace internal {
@ -193,6 +194,9 @@ inline char* Prettify(char* buffer, int length, int k) {
inline char* dtoa(double value, char* buffer) { inline char* dtoa(double value, char* buffer) {
if (value == 0) { if (value == 0) {
Double d(value);
if (d.Sign())
*buffer++ = '-'; // -0.0, Issue #289
buffer[0] = '0'; buffer[0] = '0';
buffer[1] = '.'; buffer[1] = '.';
buffer[2] = '0'; buffer[2] = '0';

3
test/unittest/readertest.cpp
View File

@ -187,6 +187,8 @@ static void TestParseDouble() {
Reader reader; \ Reader reader; \
ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code()); \ ASSERT_EQ(kParseErrorNone, reader.Parse<fullPrecision ? kParseFullPrecisionFlag : 0>(s, h).Code()); \
EXPECT_EQ(1u, h.step_); \ EXPECT_EQ(1u, h.step_); \
internal::Double e(x), a(h.actual_); \
EXPECT_EQ(e.Sign(), a.Sign()); \
if (fullPrecision) { \ if (fullPrecision) { \
EXPECT_EQ(x, h.actual_); \ EXPECT_EQ(x, h.actual_); \
if (x != h.actual_) \ if (x != h.actual_) \
@ -197,6 +199,7 @@ static void TestParseDouble() {
} }
TEST_DOUBLE(fullPrecision, "0.0", 0.0); TEST_DOUBLE(fullPrecision, "0.0", 0.0);
TEST_DOUBLE(fullPrecision, "-0.0", -0.0); // For checking issue #289
TEST_DOUBLE(fullPrecision, "1.0", 1.0); TEST_DOUBLE(fullPrecision, "1.0", 1.0);
TEST_DOUBLE(fullPrecision, "-1.0", -1.0); TEST_DOUBLE(fullPrecision, "-1.0", -1.0);
TEST_DOUBLE(fullPrecision, "1.5", 1.5); TEST_DOUBLE(fullPrecision, "1.5", 1.5);

2
test/unittest/writertest.cpp
View File

@ -93,7 +93,7 @@ TEST(Writer, String) {
TEST(Writer, Double) { TEST(Writer, Double) {
TEST_ROUNDTRIP("[1.2345,1.2345678,0.123456789012,1234567.8]"); TEST_ROUNDTRIP("[1.2345,1.2345678,0.123456789012,1234567.8]");
TEST_ROUNDTRIP("[-0.0]"); // Issue #289
} }
TEST(Writer, Transcode) { TEST(Writer, Transcode) {