Revert 1.0.0 parsing change

danielaparker · Jan 8, 2025 · ec77f55 · ec77f55
1 parent 5c8f03d
commit ec77f55
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 395 deletions.
diff --git a/examples/src/json_parser_examples.cpp b/examples/src/json_parser_examples.cpp
@@ -4,8 +4,6 @@
 #include <jsoncons/json.hpp>
 #include <iostream>
 
-#if JSONCONS_VERSION_MAJOR == 0 && JSONCONS_VERSION_MINOR < 179
-
 void incremental_parsing_example()
 {
     jsoncons::json_decoder<jsoncons::json> decoder;
@@ -43,51 +41,6 @@ void incremental_parsing_example()
     }
 }
 
-#else
-
-void incremental_parsing_example()
-{
-    std::vector<std::string> chunks = {"[fal", "se,", "9", "0]"};
-    std::size_t index = 0;
-
-    auto read_chunk = [&](jsoncons::parser_input& input, std::error_code& /*ec*/) -> bool
-    {
-        if (index < chunks.size())
-        {
-            input.set_buffer(chunks[index].data(), chunks[index].size());
-            ++index;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    };
-
-    jsoncons::json_decoder<jsoncons::json> decoder;
-    jsoncons::json_parser parser{read_chunk};
-
-    parser.reset();
-    try
-    {
-        parser.parse_some(decoder);
-        std::cout << "(1) done: " << std::boolalpha << parser.done() << ", source_exhausted: " << parser.source_exhausted() << "\n\n";
-        parser.finish_parse(decoder);
-        std::cout << "(2) done: " << std::boolalpha << parser.done() << ", source_exhausted: " << parser.source_exhausted() << "\n\n";
-        parser.check_done();
-        std::cout << "(3) done: " << std::boolalpha << parser.done() << ", source_exhausted: " << parser.source_exhausted() << "\n\n";
-
-        jsoncons::json j = decoder.get_result();
-        std::cout << "(4) " << j << "\n\n";
-    }
-    catch (const jsoncons::ser_error& e)
-    {
-        std::cout << e.what() << '\n';
-    }
-}
-
-#endif
-
 void parse_nan_replacement_example()
 {
     std::string s = R"(
@@ -106,11 +59,7 @@ void parse_nan_replacement_example()
     jsoncons::json_parser parser(options);
     try
     {
-#if JSONCONS_VERSION_MAJOR == 0 && JSONCONS_VERSION_MINOR < 179
-        parser.update(s);     // until 1.0.0
-#else        
-        parser.set_buffer(s.data(), s.size());   // since 1.0.0
-#endif        
+        parser.update(s.data(), s.size());   // since 1.0.0
         parser.parse_some(decoder);
         parser.finish_parse(decoder);
         parser.check_done();

diff --git a/include/jsoncons/chunk_reader.hpp b/include/jsoncons/chunk_reader.hpp
diff --git a/include/jsoncons/json_parser.hpp b/include/jsoncons/json_parser.hpp
@@ -7,20 +7,28 @@
 #ifndef JSONCONS_JSON_PARSER_HPP
 #define JSONCONS_JSON_PARSER_HPP
 
+#include <cstddef>
+#include <cstdint>
+#include <functional> // std::function
+#include <limits> // std::numeric_limits
 #include <memory> // std::allocator
 #include <string>
-#include <vector>
-#include <stdexcept>
 #include <system_error>
 #include <unordered_map>
-#include <limits> // std::numeric_limits
-#include <functional> // std::function
+#include <utility>
+#include <vector>
+
+#include <jsoncons/config/compiler_support.hpp>
+#include <jsoncons/chunk_reader.hpp>
+#include <jsoncons/detail/parse_number.hpp>
+#include <jsoncons/json_error.hpp>
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/json_filter.hpp>
 #include <jsoncons/json_options.hpp>
 #include <jsoncons/json_visitor.hpp>
-#include <jsoncons/json_error.hpp>
-#include <jsoncons/detail/parse_number.hpp>
+#include <jsoncons/ser_context.hpp>
+#include <jsoncons/tag_type.hpp>
+#include <jsoncons/utility/unicode_traits.hpp>
 
 #define JSONCONS_ILLEGAL_CONTROL_CHARACTER \
         case 0x00:case 0x01:case 0x02:case 0x03:case 0x04:case 0x05:case 0x06:case 0x07:case 0x08:case 0x0b: \

diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp
@@ -7,18 +7,23 @@
 #ifndef JSONCONS_JSON_READER_HPP
 #define JSONCONS_JSON_READER_HPP
 
+#include <cstddef>
+#include <functional>
+#include <ios>
 #include <memory> // std::allocator
 #include <string>
-#include <vector>
-#include <stdexcept>
 #include <system_error>
-#include <ios>
 #include <utility> // std::move
-#include <jsoncons/source.hpp>
+
+#include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/json_exception.hpp>
-#include <jsoncons/json_visitor.hpp>
 #include <jsoncons/json_parser.hpp>
+#include <jsoncons/json_visitor.hpp>
+#include <jsoncons/ser_context.hpp>
+#include <jsoncons/source.hpp>
 #include <jsoncons/source_adaptor.hpp>
+#include <jsoncons/tag_type.hpp>
+#include <jsoncons/utility/unicode_traits.hpp>
 
 namespace jsoncons {
 

diff --git a/include/jsoncons_ext/csv/csv_cursor.hpp b/include/jsoncons_ext/csv/csv_cursor.hpp
@@ -288,7 +288,7 @@ class basic_csv_cursor : public basic_staj_cursor<CharT>, private virtual ser_co
             JSONCONS_THROW(ser_error(json_errc::illegal_unicode_character,parser_.line(),parser_.column()));
         }
         std::size_t offset = (r.ptr - sv.data());
-        parser_.set_buffer(sv.data()+offset,sv.size()-offset);
+        parser_.update(sv.data()+offset,sv.size()-offset);
         if (!done())
         {
             next();
@@ -304,7 +304,7 @@ class basic_csv_cursor : public basic_staj_cursor<CharT>, private virtual ser_co
             return;
         }
         std::size_t offset = (r.ptr - sv.data());
-        parser_.set_buffer(sv.data()+offset,sv.size()-offset);
+        parser_.update(sv.data()+offset,sv.size()-offset);
         if (!done())
         {
             next(ec);
@@ -327,7 +327,7 @@ class basic_csv_cursor : public basic_staj_cursor<CharT>, private virtual ser_co
                 if (ec) {return;}
                 if (s.size() > 0)
                 {
-                    parser_.set_buffer(s.data(),s.size());
+                    parser_.update(s.data(),s.size());
                 }
             }
             parser_.parse_some(visitor, ec);