From b1ff9a65201c8cbea505550a501df4cd9377314b Mon Sep 17 00:00:00 2001 From: Hao Zhang Date: Thu, 12 Nov 2026 18:57:30 +0800 Subject: [PATCH] support flag kParseFloatAndOverflowNumAsNumStr to parse float as string --- include/sonic/dom/flags.h | 3 +++ include/sonic/dom/parser.h | 4 ++++ tests/jsonpath_test.cpp | 25 +++++++++++++++++++++++++ tests/parsenumber_test.cpp | 32 ++++++++++++++++++++++++++++++++ tests/parser_oom_test.cpp | 10 ++++++++++ 5 files changed, 74 insertions(+) diff --git a/include/sonic/dom/flags.h b/include/sonic/dom/flags.h index a16a4272..49134227 100644 --- a/include/sonic/dom/flags.h +++ b/include/sonic/dom/flags.h @@ -29,6 +29,9 @@ enum class ParseFlags : uint32_t { // native numeric representation. In-range floating-point numbers stay // double; in-range integers stay int64/uint64. kParseOverflowNumAsNumStr = 1 << 3, + // Use the legacy number-string policy: preserve floating-point and overflow + // numbers as NumStr while keeping in-range integers as int64/uint64. + kParseFloatAndOverflowNumAsNumStr = 1 << 4, }; // Compatibility layer for downstream users. diff --git a/include/sonic/dom/parser.h b/include/sonic/dom/parser.h index 3521e6c2..05c2e163 100644 --- a/include/sonic/dom/parser.h +++ b/include/sonic/dom/parser.h @@ -222,6 +222,10 @@ class Parser { template sonic_force_inline bool parseNumber(SAX &sax) { + if constexpr (parseFlags & ParseFlags::kParseFloatAndOverflowNumAsNumStr) { + return parseNumberAsString(sax); + } + // These helper macros are used only within this function. // Define/undefine them locally to avoid leaking into includers. #undef FLOATING_LONGEST_DIGITS diff --git a/tests/jsonpath_test.cpp b/tests/jsonpath_test.cpp index acf91540..fd7bd1b9 100644 --- a/tests/jsonpath_test.cpp +++ b/tests/jsonpath_test.cpp @@ -893,4 +893,29 @@ TEST(JsonPathDump, SerializeAcceptsConstResult) { EXPECT_EQ(std::get<1>(dumped), kErrorNone); EXPECT_EQ(std::get<0>(dumped), "abc"); } + +TEST(JsonPathDump, NumericValuesPreserveOriginalText) { + const std::vector numbers = { + "221.5222225222225222", + "1e10", + "1e400", + }; + for (const auto& number : numbers) { + SCOPED_TRACE(number); + Document doc; + doc.Parse( + "{\"v\":" + number + "}"); + ASSERT_FALSE(doc.HasParseError()); + + Document& cdoc = doc; + const auto result = cdoc.AtJsonPath("$.v"); + ASSERT_EQ(result.error, kErrorNone); + ASSERT_EQ(result.nodes.size(), 1); + + sonic_json::WriteBuffer wb; + const auto err = result.nodes[0]->Serialize(wb); + ASSERT_EQ(err, kErrorNone); + EXPECT_EQ(wb.ToStringView(), number); + } +} } // namespace diff --git a/tests/parsenumber_test.cpp b/tests/parsenumber_test.cpp index 614486c9..ae295932 100644 --- a/tests/parsenumber_test.cpp +++ b/tests/parsenumber_test.cpp @@ -399,6 +399,38 @@ TEST(ParserTest, ParseOverflowNumAsNumStr_InRangeIntegerKeepsType) { } } +TEST(ParserTest, ParseNumAsStrUsesLegacyPolicy) { + const std::vector string_numbers = { + "1.5", "1e10", "18446744073709551616", "1e400"}; + + for (const auto& input : string_numbers) { + SCOPED_TRACE(input); + Document doc; + doc.Parse(input.data(), + input.size()); + ASSERT_FALSE(doc.HasParseError()); + ASSERT_TRUE(doc.IsStringNumber()); + EXPECT_EQ(doc.GetStringView(), input); + EXPECT_EQ(doc.Dump(), input); + } + + { + Document doc; + doc.Parse("42"); + ASSERT_FALSE(doc.HasParseError()); + ASSERT_TRUE(doc.IsUint64()); + EXPECT_EQ(doc.GetUint64(), 42U); + } + + { + Document doc; + doc.Parse("-42"); + ASSERT_FALSE(doc.HasParseError()); + ASSERT_TRUE(doc.IsInt64()); + EXPECT_EQ(doc.GetInt64(), -42); + } +} + TEST(ParserTest, ParseStringNumber_ZeroExponentStaysDouble) { Document doc; std::string input = "0e+123"; diff --git a/tests/parser_oom_test.cpp b/tests/parser_oom_test.cpp index 3b455eb8..39dc433b 100644 --- a/tests/parser_oom_test.cpp +++ b/tests/parser_oom_test.cpp @@ -482,6 +482,16 @@ TEST(Parser, NumberOverflowAsNumStrRejectionReportsSaxTermination) { EXPECT_EQ(kSaxTermination, res.Error()); } +TEST(Parser, NumberAsNumStrRejectionReportsSaxTermination) { + const char* json = "1e10"; + auto buf = pad_json_for_parser(json, std::strlen(json)); + RejectingSAX sax; + sax.reject_numstr = true; + Parser p; + auto res = p.Parse(buf.data(), std::strlen(json), sax); + EXPECT_EQ(kSaxTermination, res.Error()); +} + TEST(Parser, NullRejectionReportsSaxTermination) { const char* json = "null"; auto buf = pad_json_for_parser(json, std::strlen(json));