function_objects.hpp

Author: danielaparker

include/jsoncons/typed_array.hpp

@@ -207,7 +207,7 @@ class slice
     }
 };
 
-enum class typed_array_layout_kind {row_major, column_major};
+enum class mdarray_order {row_major, column_major};
 
 struct row_major_layout
 {
@@ -341,7 +341,7 @@ class mdarray_iterator : public typed_array_iterator
     bool done_{false};
 public:
     template <typename Layout= jsoncons::row_major_layout>
-    mdarray_iterator(jsoncons::span<ValueType> data, const std::vector<std::size_t>& extents,
+    mdarray_iterator(jsoncons::span<ValueType> data, jsoncons::span<const std::size_t> extents,
         Layout layout = Layout())
         : data_{data}, dimensions_(extents.size(), mdarray_dimension<ValueType>{})
     {

include/jsoncons_ext/cbor/cbor_parser.hpp

@@ -142,6 +142,8 @@ class basic_cbor_parser : public ser_context
     byte_string_type bytes_buffer_;
     std::vector<parse_state,parse_state_allocator_type> state_stack_;
     bool is_typed_array_{false};
+    bool is_multi_dim_{false};
+    mdarray_order order_{};
     std::unique_ptr<typed_array_iterator> typed_array_iter_;
     typed_array_element_types element_type_{};
     semantic_tag typed_array_tag_{};
@@ -232,6 +234,21 @@ class basic_cbor_parser : public ser_context
         return is_typed_array_;
     }
 
+    bool is_multi_dim() const
+    {
+        return is_multi_dim_;
+    }
+
+    mdarray_order order() const
+    {
+        return order_;
+    }
+
+    jsoncons::span<const std::size_t> extents() const
+    {
+        return jsoncons::span<const std::size_t>(extents_.data(), extents_.size());
+    }
+
     template <typename Sourceable>
     void reset(Sourceable&& source)
     {
@@ -297,6 +314,8 @@ class basic_cbor_parser : public ser_context
     void to_end_array()
     {
         is_typed_array_ = false;
+        is_multi_dim_ = false;
+        order_ = mdarray_order{};
         state_stack_.pop_back();
     }
 
@@ -672,9 +691,11 @@ class basic_cbor_parser : public ser_context
                             more_ = !cursor_mode_;
                             break;
                         case 40: // row major storage
+                            order_ = mdarray_order::row_major;
                             produce_begin_multi_dim(visitor, semantic_tag::multi_dim_row_major, ec);
                             break;
                         case 1040: // column major storage
+                            order_ = mdarray_order::column_major;
                             produce_begin_multi_dim(visitor, semantic_tag::multi_dim_column_major, ec);
                             break;
                         default: