From a7307a38d43a95ee4d94e2bfda37c08782a1e685 Mon Sep 17 00:00:00 2001 From: sabudilovskiy Date: Tue, 8 Oct 2024 21:11:09 +0000 Subject: [PATCH] - --- gtest/parsers/fixtures.hpp | 2 +- gtest/parsers/test_stream.cpp | 14 +++++++------- .../tools/json_tools/boost_parse_generator.hpp | 2 +- .../json_tools/generator_parser/ignore_parser.hpp | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gtest/parsers/fixtures.hpp b/gtest/parsers/fixtures.hpp index 1d943d9f..40d3842c 100644 --- a/gtest/parsers/fixtures.hpp +++ b/gtest/parsers/fixtures.hpp @@ -46,6 +46,6 @@ struct GeneratorBoost : testing::Test { TEST_F(DomBoost, Name) __VA_ARGS__ \ TEST_F(HandlerRapid, Name) __VA_ARGS__ \ TEST_F(HandlerBoost, Name) __VA_ARGS__ \ - TEST_F(GeneratorBoost, Name) __VA_ARGS__ + TEST_F(GeneratorBoost, Name) __VA_ARGS__ // clang-format on diff --git a/gtest/parsers/test_stream.cpp b/gtest/parsers/test_stream.cpp index 7a3215ab..388c9c0e 100644 --- a/gtest/parsers/test_stream.cpp +++ b/gtest/parsers/test_stream.cpp @@ -41,7 +41,7 @@ TEST(StreamParsing, Int) { parser parser(got); parser.parse(STR(R"( {"int_field": 1 -)")); +)"), false); parser.parse(STR(R"( 23} )"), @@ -54,7 +54,7 @@ TEST(StreamParsing, DoublePointLeft) { parser parser(got); parser.parse(STR(R"( {"double_field": 21. -)")); +)"), false); parser.parse(STR(R"( 12} )"), @@ -69,7 +69,7 @@ TEST(StreamParsing, DoublePointRight) { parser parser(got); parser.parse(STR(R"( {"double_field": 21 -)")); +)"), false); parser.parse(STR(R"( .12} )"), @@ -88,7 +88,7 @@ TEST(StreamParsing, Bool) { std::string_view second = full_json.substr(full_json.size() - i, i); TestObject got; parser parser(got); - parser.parse(first); + parser.parse(first, false); parser.parse(second, true); EXPECT_EQ(expected, got); @@ -105,7 +105,7 @@ TEST(StreamParsing, Null) { std::string_view second = full_json.substr(full_json.size() - i, i); TestObject got; parser parser(got); - parser.parse(first); + parser.parse(first, false); parser.parse(second, true); EXPECT_EQ(expected, got); @@ -125,7 +125,7 @@ field": "test"} TestObject got; parser parser(got); - parser.parse(first); + parser.parse(first, false); parser.parse(second, true); EXPECT_EQ(expected, got); } @@ -175,7 +175,7 @@ TEST(StreamParser, NestedObjectsInArray) { std::string_view first = json.substr(0, i); std::string_view second = json.substr(i); - parser.parse(first); + parser.parse(first, false); parser.parse(second, true); EXPECT_EQ(expected, got) << "failed on : " << i; } diff --git a/include/tgbm/tools/json_tools/boost_parse_generator.hpp b/include/tgbm/tools/json_tools/boost_parse_generator.hpp index 734d4ffe..2566d43b 100644 --- a/include/tgbm/tools/json_tools/boost_parse_generator.hpp +++ b/include/tgbm/tools/json_tools/boost_parse_generator.hpp @@ -205,7 +205,7 @@ struct stream_parser { stream_parser(T& t) : p(::boost::json::parse_options{}, t) { } - void parse(std::string_view data, bool end = false) { + void parse(std::string_view data, bool end) { p.write_some(!end, data.data(), data.size(), ec); if (ec || (end && !p.handler().ended)) { LOG_ERR("ec: {}, ended: {}", ec.message(), p.handler().ended); diff --git a/include/tgbm/tools/json_tools/generator_parser/ignore_parser.hpp b/include/tgbm/tools/json_tools/generator_parser/ignore_parser.hpp index b2af26ed..310559d9 100644 --- a/include/tgbm/tools/json_tools/generator_parser/ignore_parser.hpp +++ b/include/tgbm/tools/json_tools/generator_parser/ignore_parser.hpp @@ -32,8 +32,7 @@ struct ignore_parser { break; case event_holder::key_part: case event_holder::string_part: - co_yield {}; - break; + unreachable(); case event_holder::array_end: case event_holder::object_end: depth--;