From 905e12611039dc82d1413706634ea28f394edc2b Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Mon, 1 Jul 2024 20:16:36 -0400 Subject: [PATCH] CHANGELOG update --- CHANGELOG.md | 5 + include/jsoncons/json_reader.hpp | 283 ------------------------------- 2 files changed, 5 insertions(+), 283 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f5ed0742..b97a9095d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +master +------- + +- Removed deprecated functions and type names identified in #487 + 0.176.0 ------- diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp index 61e5505d8..673f767ba 100644 --- a/include/jsoncons/json_reader.hpp +++ b/include/jsoncons/json_reader.hpp @@ -408,289 +408,6 @@ namespace jsoncons { } }; - template,class TempAllocator=std::allocator> - class legacy_basic_json_reader - { - public: - using char_type = CharT; - using source_type = Source; - using string_view_type = jsoncons::basic_string_view; - private: - using char_allocator_type = typename std::allocator_traits:: template rebind_alloc; - - static constexpr size_t default_max_buffer_size = 16384; - - json_source_adaptor source_; - basic_default_json_visitor default_visitor_; - basic_json_visitor& visitor_; - basic_json_parser parser_; - - // Noncopyable and nonmoveable - legacy_basic_json_reader(const legacy_basic_json_reader&) = delete; - legacy_basic_json_reader& operator=(const legacy_basic_json_reader&) = delete; - - public: - template - explicit legacy_basic_json_reader(Sourceable&& source, const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - default_visitor_, - basic_json_decode_options(), - default_json_parsing(), - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - const basic_json_decode_options& options, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - default_visitor_, - options, - default_json_parsing(), - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - std::function err_handler, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - default_visitor_, - basic_json_decode_options(), - err_handler, - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - const basic_json_decode_options& options, - std::function err_handler, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - default_visitor_, - options, - err_handler, - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - basic_json_visitor& visitor, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - visitor, - basic_json_decode_options(), - default_json_parsing(), - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - basic_json_visitor& visitor, - const basic_json_decode_options& options, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - visitor, - options, - default_json_parsing(), - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - basic_json_visitor& visitor, - std::function err_handler, - const TempAllocator& temp_alloc = TempAllocator()) - : legacy_basic_json_reader(std::forward(source), - visitor, - basic_json_decode_options(), - err_handler, - temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - basic_json_visitor& visitor, - const basic_json_decode_options& options, - std::function err_handler, - const TempAllocator& temp_alloc = TempAllocator(), - typename std::enable_if,Sourceable>::value>::type* = 0) - : source_(std::forward(source)), - visitor_(visitor), - parser_(options,err_handler,temp_alloc) - { - } - - template - legacy_basic_json_reader(Sourceable&& source, - basic_json_visitor& visitor, - const basic_json_decode_options& options, - std::function err_handler, - const TempAllocator& temp_alloc = TempAllocator(), - typename std::enable_if,Sourceable>::value>::type* = 0) - : source_(), - visitor_(visitor), - parser_(options,err_handler,temp_alloc) - { - jsoncons::basic_string_view sv(std::forward(source)); - - auto r = unicode_traits::detect_json_encoding(sv.data(), sv.size()); - if (!(r.encoding == unicode_traits::encoding_kind::utf8 || r.encoding == unicode_traits::encoding_kind::undetected)) - { - JSONCONS_THROW(ser_error(json_errc::illegal_unicode_character,parser_.line(),parser_.column())); - } - std::size_t offset = (r.ptr - sv.data()); - parser_.update(sv.data()+offset,sv.size()-offset); - } - - void read_next() - { - std::error_code ec; - read_next(ec); - if (ec) - { - JSONCONS_THROW(ser_error(ec,parser_.line(),parser_.column())); - } - } - - void read_next(std::error_code& ec) - { - if (source_.is_error()) - { - ec = json_errc::source_error; - return; - } - parser_.reset(); - while (!parser_.stopped()) - { - if (parser_.source_exhausted()) - { - auto s = source_.read_buffer(ec); - if (ec) return; - if (s.size() > 0) - { - parser_.update(s.data(),s.size()); - } - } - bool eof = parser_.source_exhausted(); - parser_.parse_some(visitor_, ec); - if (ec) return; - if (eof) - { - if (parser_.enter()) - { - break; - } - else if (!parser_.accept()) - { - ec = json_errc::unexpected_eof; - return; - } - } - } - - while (!source_.eof()) - { - parser_.skip_whitespace(); - if (parser_.source_exhausted()) - { - auto s = source_.read_buffer(ec); - if (ec) return; - if (s.size() > 0) - { - parser_.update(s.data(),s.size()); - } - } - else - { - break; - } - } - } - - void check_done() - { - std::error_code ec; - check_done(ec); - if (ec) - { - JSONCONS_THROW(ser_error(ec,parser_.line(),parser_.column())); - } - } - - std::size_t line() const - { - return parser_.line(); - } - - std::size_t column() const - { - return parser_.column(); - } - - void check_done(std::error_code& ec) - { - if (source_.is_error()) - { - ec = json_errc::source_error; - return; - } - if (source_.eof()) - { - parser_.check_done(ec); - if (ec) return; - } - else - { - do - { - if (parser_.source_exhausted()) - { - auto s = source_.read_buffer(ec); - if (ec) return; - if (s.size() > 0) - { - parser_.update(s.data(),s.size()); - } - } - if (!parser_.source_exhausted()) - { - parser_.check_done(ec); - if (ec) return; - } - } - while (!eof()); - } - } - - bool eof() const - { - return parser_.source_exhausted() && source_.eof(); - } - - void read() - { - read_next(); - check_done(); - } - - void read(std::error_code& ec) - { - read_next(ec); - if (!ec) - { - check_done(ec); - } - } - }; - using json_string_reader = basic_json_reader>; using wjson_string_reader = basic_json_reader>; using json_stream_reader = basic_json_reader>;