Revert 1.0.0 parsing change

danielaparker · Jan 8, 2025 · f5db1e6 · f5db1e6
1 parent b773aa4
commit f5db1e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/include/jsoncons/basic_json.hpp b/include/jsoncons/basic_json.hpp
@@ -1913,7 +1913,7 @@ namespace jsoncons {
                 JSONCONS_THROW(ser_error(json_errc::illegal_unicode_character,parser.line(),parser.column()));
             }
             std::size_t offset = (r.ptr - source.data());
-            parser.set_buffer(source.data()+offset,source.size()-offset);
+            parser.update(source.data()+offset,source.size()-offset);
             parser.parse_some(decoder);
             parser.finish_parse(decoder);
             parser.check_done();
@@ -2084,7 +2084,7 @@ namespace jsoncons {
                 JSONCONS_THROW(ser_error(json_errc::illegal_unicode_character,parser.line(),parser.column()));
             }
             std::size_t offset = (r.ptr - source.data());
-            parser.set_buffer(source.data()+offset,source.size()-offset);
+            parser.update(source.data()+offset,source.size()-offset);
             parser.parse_some(decoder);
             parser.finish_parse(decoder);
             parser.check_done();

diff --git a/include/jsoncons/json_cursor.hpp b/include/jsoncons/json_cursor.hpp
@@ -337,7 +337,7 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                     if (ec) {return;}
                     if (s.size() > 0)
                     {
-                        parser_.set_buffer(s.data(),s.size());
+                        parser_.update(s.data(),s.size());
                     }
                 }
                 if (!parser_.source_exhausted())
@@ -398,7 +398,7 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
             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);
         bool is_done = parser_.done() || done_;
         if (!is_done)
         {
@@ -444,7 +444,7 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                 if (ec) {return;}
                 if (s.size() > 0)
                 {
-                    parser_.set_buffer(s.data(),s.size());
+                    parser_.update(s.data(),s.size());
                     if (ec) {return;}
                 }
             }

diff --git a/include/jsoncons/json_parser.hpp b/include/jsoncons/json_parser.hpp
@@ -582,6 +582,9 @@ class basic_json_parser : public ser_context
                     more_ = false;
                     break;
                 case json_parse_state::start:
+                    more_ = false;
+                    ec = json_errc::unexpected_eof;
+                    break;                
                 case json_parse_state::done:
                     more_ = false;
                     break;

diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp
@@ -313,6 +313,7 @@ namespace jsoncons {
                 }
             }
 
+            parser_.skip_whitespace();
             while (!source_.eof())
             {
                 parser_.skip_whitespace();
@@ -389,6 +390,7 @@ namespace jsoncons {
 
         bool eof() const
         {
+            std::cout << "parser no more source: " << parser_.source_exhausted() << ", source eof: " << source_.eof() << "\n";
             return parser_.source_exhausted() && source_.eof();
         }