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

Author: danielaparker

include/jsoncons/staj_cursor.hpp

@@ -74,24 +74,6 @@ class basic_staj_visitor : public basic_json_visitor<CharT>
         return event_;
     }
 
-    bool in_available() const
-    {
-        return state_ != staj_cursor_state();
-    }
-
-    void send_available(std::error_code& ec)
-    {
-        switch (state_)
-        {
-            case staj_cursor_state::multi_dim:
-            case staj_cursor_state::shape:
-                advance_multi_dim(ec);
-                break;
-            default:
-                break;
-        }
-    }
-
     staj_cursor_state state() const
     {
         return state_;

include/jsoncons/staj_event_reader.hpp

@@ -72,24 +72,6 @@ namespace jsoncons {
             return event_;
         }
 
-        bool in_available() const
-        {
-            return state_ != item_event_reader_state();
-        }
-
-        void send_available(std::error_code& ec)
-        {
-            switch (state_)
-            {
-                case item_event_reader_state::multi_dim:
-                case item_event_reader_state::shape:
-                    advance_multi_dim(ec);
-                    break;
-                default:
-                    break;
-            }
-        }
-
         item_event_reader_state state() const
         {
             return state_;

include/jsoncons/typed_array.hpp

@@ -209,42 +209,6 @@ class slice
 
 enum class mdarray_order {row_major, column_major};
 
-struct row_major_layout
-{
-    std::vector<std::size_t> operator()(jsoncons::span<const std::size_t> extents) const
-    {
-        std::vector<std::size_t> strides(extents.size(), 0);
-
-        std::size_t size = 1;
-        const size_t num_extents = extents.size();
-        for (size_t i = 0; i < num_extents; ++i)
-        {
-            strides[num_extents-i-1] = size;
-            size *= extents[num_extents-i-1];
-        }
-
-        return strides;
-    }
-};
-
-struct column_major_layout
-{
-    std::vector<std::size_t> operator()(jsoncons::span<const std::size_t> extents) const
-    {
-        std::vector<std::size_t> strides(extents.size(), 0);
-
-        std::size_t size = 1;
-        const size_t num_extents = extents.size();
-        for (size_t i = 0; i < num_extents; ++i)
-        {
-            strides[i] = size;
-            size *= extents[i];
-        }
-
-        return strides;
-    }
-};
-
 class typed_array_iterator
 {
 public:
@@ -281,7 +245,7 @@ class typed_array_iterator
 };
 
 template <typename ValueType, typename Func=jsoncons::identity>
-class typed_array_span_iterator : public typed_array_iterator
+class sequential_typed_array_iterator : public typed_array_iterator
 {
     jsoncons::span<ValueType> data_;
     semantic_tag tag_;
@@ -290,7 +254,7 @@ class typed_array_span_iterator : public typed_array_iterator
     bool done_{false};
     std::size_t index_{0};
 public:
-    typed_array_span_iterator(jsoncons::span<ValueType> data, 
+    sequential_typed_array_iterator(jsoncons::span<ValueType> data, 
         semantic_tag tag = semantic_tag{}, Func func = Func())
         : data_(data), tag_(tag), func_(func)
     {
@@ -340,12 +304,31 @@ class mdarray_iterator : public typed_array_iterator
     bool first_{true};
     bool done_{false};
 public:
-    template <typename Layout= jsoncons::row_major_layout>
     mdarray_iterator(jsoncons::span<ValueType> data, jsoncons::span<const std::size_t> extents,
-        Layout layout = Layout())
+        mdarray_order order = mdarray_order::row_major)
         : data_{data}, dimensions_(extents.size(), mdarray_dimension<ValueType>{})
     {
-        std::vector<std::size_t> strides = layout(extents);
+        std::vector<std::size_t> strides(extents.size(), 0);
+        if (order == mdarray_order::column_major)
+        {
+            std::size_t stride = 1;
+            const size_t num_extents = extents.size();
+            for (size_t i = 0; i < num_extents; ++i)
+            {
+                strides[i] = stride;
+                stride *= extents[i];
+            }
+        }
+        else
+        {
+            std::size_t stride = 1;
+            const size_t num_extents = extents.size();
+            for (size_t i = 0; i < num_extents; ++i)
+            {
+                strides[num_extents-i-1] = stride;
+                stride *= extents[num_extents-i-1];
+            }
+        }
         for (std::size_t i = 0; i < strides.size(); ++i)
         {
             dimensions_[i].extent = extents[i];

include/jsoncons_ext/cbor/cbor_cursor.hpp

@@ -288,18 +288,11 @@ class basic_cbor_cursor : public basic_staj_cursor<char>, private virtual ser_co
 
     void read_next(std::error_code& ec)
     {
-        if (cursor_visitor_.in_available())
+        parser_.restart();
+        while (!parser_.stopped())
         {
-            cursor_visitor_.send_available(ec);
-        }
-        else
-        {
-            parser_.restart();
-            while (!parser_.stopped())
-            {
-                parser_.parse(cursor_handler_adaptor_, ec);
-                if (JSONCONS_UNLIKELY(ec)) {return;}
-            }
+            parser_.parse(cursor_handler_adaptor_, ec);
+            if (JSONCONS_UNLIKELY(ec)) {return;}
         }
     }
 

include/jsoncons_ext/cbor/cbor_event_reader.hpp

@@ -251,18 +251,11 @@ class cbor_event_reader : public basic_staj_event_reader<char>, private virtual
 
     void read_next(std::error_code& ec)
     {
-        if (cursor_visitor_.in_available())
-        {
-            cursor_visitor_.send_available(ec);
-        }
-        else
+        parser_.restart();
+        while (!parser_.stopped())
         {
-            parser_.restart();
-            while (!parser_.stopped())
-            {
-                parser_.parse(cursor_visitor_, ec);
-                if (JSONCONS_UNLIKELY(ec)) {return;}
-            }
+            parser_.parse(cursor_visitor_, ec);
+            if (JSONCONS_UNLIKELY(ec)) {return;}
         }
     }