Merge branch 'json_cursor' of https://github.com/danielaparker/jsoncons

Author: danielaparker

include/jsoncons/decode_traits.hpp

@@ -190,6 +190,7 @@ namespace jsoncons {
             {
                 v.push_back(decode_traits<value_type,CharT>::decode(cursor, decoder, ec));
                 if (ec) {return T{};}
+                //std::cout << "read next 10\n";
                 cursor.next(ec);
             }
             return v;
@@ -479,6 +480,7 @@ namespace jsoncons {
             {
                 v.insert(decode_traits<value_type,CharT>::decode(cursor, decoder, ec));
                 if (ec) {return T{};}
+                //std::cout << "cursor.next 20\n";
                 cursor.next(ec);
                 if (ec) {return T{};}
             }
@@ -525,6 +527,7 @@ namespace jsoncons {
             {
                 v[i] = decode_traits<value_type,CharT>::decode(cursor, decoder, ec);
                 if (ec) {return v;}
+                //std::cout << "cursor.next 100\n";
                 cursor.next(ec);
                 if (ec) {return v;}
             }
@@ -571,10 +574,12 @@ namespace jsoncons {
                 }
                 auto key = cursor.current().template get<key_type>(ec);
                 if (ec) {return val;}
+                //std::cout << "cursor.next 200\n";
                 cursor.next(ec);
                 if (ec) {return val;}
                 val.emplace(std::move(key),decode_traits<mapped_type,CharT>::decode(cursor, decoder, ec));
                 if (ec) {return val;}
+                //std::cout << "cursor.next 300\n";
                 cursor.next(ec);
                 if (ec) {return val;}
             }
@@ -635,10 +640,12 @@ namespace jsoncons {
                     ec = json_errc::invalid_number;
                     return val;
                 }
+                //std::cout << "cursor.next 500\n";
                 cursor.next(ec);
                 if (ec) {return val;}
                 val.emplace(n, decode_traits<mapped_type,CharT>::decode(cursor, decoder, ec));
                 if (ec) {return val;}
+                //std::cout << "cursor.next 600\n";
                 cursor.next(ec);
                 if (ec) {return val;}
             }

include/jsoncons/json_cursor.hpp

@@ -43,7 +43,7 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
     json_source_adaptor<Source> source_;
     basic_json_parser<CharT,Allocator> parser_;
     basic_staj_visitor<CharT> cursor_visitor_;
-    bool done_;
+    bool done_{false};
 
 public:
 
@@ -57,9 +57,9 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                       typename std::enable_if<!std::is_constructible<jsoncons::basic_string_view<CharT>,Sourceable>::value>::type* = 0)
        : source_(std::forward<Sourceable>(source)),
          parser_(options,err_handler,alloc),
-         cursor_visitor_(accept_all),
-         done_(false)
+         cursor_visitor_(accept_all)
     {
+        parser_.cursor_mode(true);
         if (!done())
         {
             std::error_code local_ec;
@@ -86,9 +86,9 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                       typename std::enable_if<std::is_constructible<jsoncons::basic_string_view<CharT>,Sourceable>::value>::type* = 0)
        : source_(),
          parser_(options, err_handler, alloc),
-         cursor_visitor_(accept_all),
-         done_(false)
+         cursor_visitor_(accept_all)
     {
+        parser_.cursor_mode(true);
         initialize_with_string_view(std::forward<Sourceable>(source));
     }
 
@@ -139,9 +139,10 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                       typename std::enable_if<!std::is_constructible<jsoncons::basic_string_view<CharT>,Sourceable>::value>::type* = 0)
        : source_(std::forward<Sourceable>(source)),
          parser_(options,err_handler,alloc),
-         cursor_visitor_(accept_all),
-         done_(false)
+         cursor_visitor_(accept_all)
     {
+        parser_.cursor_mode(true);
+
         if (!done())
         {
             std::error_code local_ec;
@@ -169,9 +170,9 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
                       typename std::enable_if<std::is_constructible<jsoncons::basic_string_view<CharT>,Sourceable>::value>::type* = 0)
        : source_(),
          parser_(options, err_handler, alloc),
-         cursor_visitor_(accept_all),
-         done_(false)
+         cursor_visitor_(accept_all)
     {
+        parser_.cursor_mode(true);
         initialize_with_string_view(std::forward<Sourceable>(source), ec);
     }
 
@@ -279,9 +280,23 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
     void read_to(basic_json_visitor<CharT>& visitor,
                  std::error_code& ec) override
     {
-        if (cursor_visitor_.event().send_json_event(visitor, *this, ec))
+        if (is_begin_container(current().event_type()))
+        {
+            parser_.cursor_mode(false);
+            parser_.mark_level(parser_.level());
+            if (cursor_visitor_.event().send_json_event(visitor, *this, ec))
+            {
+                read_next(visitor, ec);
+            }
+            parser_.cursor_mode(true);
+            parser_.mark_level(0);
+        }
+        else
         {
-            read_next(visitor, ec);
+            if (cursor_visitor_.event().send_json_event(visitor, *this, ec))
+            {
+                read_next(visitor, ec);
+            }
         }
     }