move typed_array from visitor to cursor

danielaparker · danielaparker · commit 35088a129af5 · 2026-04-28T23:22:50.000-04:00
diff --git a/include/jsoncons/reflect/decode_traits.hpp b/include/jsoncons/reflect/decode_traits.hpp
@@ -40,14 +40,16 @@ template <typename T>
 typename std::enable_if<ext_traits::is_back_insertable<T>::value,void>::type
 read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type element_type, T& v)
 {
+    using value_type = typename T::value_type;
+
     switch (element_type)
     {
         case typed_array_element_type::uint8:
         {
             auto ta = typed_array_cast<const uint8_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -56,7 +58,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const uint16_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -65,7 +67,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const uint32_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -74,7 +76,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const uint64_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -83,7 +85,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const int8_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -92,7 +94,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const int16_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -101,7 +103,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const int32_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -110,7 +112,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const int64_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -119,7 +121,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const int16_t>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -128,7 +130,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const float>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
@@ -137,7 +139,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e
             auto ta = typed_array_cast<const double>(typed_array);
             for (auto item : ta)
             {
-                v.push_back(item);
+                v.push_back(static_cast<value_type>(item));
             }
             break;
         }
diff --git a/include/jsoncons/staj_cursor.hpp b/include/jsoncons/staj_cursor.hpp
@@ -315,7 +315,7 @@ class basic_staj_cursor
         return typed_array_element_type{};
     }
 
-    virtual jsoncons::span<uint8_t> typed_array() const 
+    virtual jsoncons::span<uint8_t> typed_array() 
     {
         return jsoncons::span<uint8_t>{};
     }
diff --git a/include/jsoncons_ext/cbor/cbor_cursor.hpp b/include/jsoncons_ext/cbor/cbor_cursor.hpp
@@ -173,7 +173,7 @@ class basic_cbor_cursor : public basic_staj_cursor<char>, private virtual ser_co
         return parser_.element_type();
     }
 
-    jsoncons::span<uint8_t> typed_array() const final
+    jsoncons::span<uint8_t> typed_array() final
     {
         return parser_.typed_array();
     }
diff --git a/include/jsoncons_ext/cbor/cbor_parser.hpp b/include/jsoncons_ext/cbor/cbor_parser.hpp
@@ -289,7 +289,7 @@ class basic_cbor_parser : public ser_context
         return element_type_;
     }
 
-    jsoncons::span<uint8_t> typed_array() const
+    jsoncons::span<uint8_t> typed_array()
     {
         return typed_array_;
     }

Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,16 @@ template <typename T>`
`40`	`40`	`typename std::enable_if<ext_traits::is_back_insertable<T>::value,void>::type`
`41`	`41`	`read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type element_type, T& v)`
`42`	`42`	`{`
	`43`	`+ using value_type = typename T::value_type;`
	`44`	`+`
`43`	`45`	`switch (element_type)`
`44`	`46`	`{`
`45`	`47`	`case typed_array_element_type::uint8:`
`46`	`48`	`{`
`47`	`49`	`auto ta = typed_array_cast<const uint8_t>(typed_array);`
`48`	`50`	`for (auto item : ta)`
`49`	`51`	`{`
`50`		`- v.push_back(item);`
	`52`	`+ v.push_back(static_cast<value_type>(item));`
`51`	`53`	`}`
`52`	`54`	`break;`
`53`	`55`	`}`
`@@ -56,7 +58,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`56`	`58`	`auto ta = typed_array_cast<const uint16_t>(typed_array);`
`57`	`59`	`for (auto item : ta)`
`58`	`60`	`{`
`59`		`- v.push_back(item);`
	`61`	`+ v.push_back(static_cast<value_type>(item));`
`60`	`62`	`}`
`61`	`63`	`break;`
`62`	`64`	`}`
`@@ -65,7 +67,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`65`	`67`	`auto ta = typed_array_cast<const uint32_t>(typed_array);`
`66`	`68`	`for (auto item : ta)`
`67`	`69`	`{`
`68`		`- v.push_back(item);`
	`70`	`+ v.push_back(static_cast<value_type>(item));`
`69`	`71`	`}`
`70`	`72`	`break;`
`71`	`73`	`}`
`@@ -74,7 +76,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`74`	`76`	`auto ta = typed_array_cast<const uint64_t>(typed_array);`
`75`	`77`	`for (auto item : ta)`
`76`	`78`	`{`
`77`		`- v.push_back(item);`
	`79`	`+ v.push_back(static_cast<value_type>(item));`
`78`	`80`	`}`
`79`	`81`	`break;`
`80`	`82`	`}`
`@@ -83,7 +85,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`83`	`85`	`auto ta = typed_array_cast<const int8_t>(typed_array);`
`84`	`86`	`for (auto item : ta)`
`85`	`87`	`{`
`86`		`- v.push_back(item);`
	`88`	`+ v.push_back(static_cast<value_type>(item));`
`87`	`89`	`}`
`88`	`90`	`break;`
`89`	`91`	`}`
`@@ -92,7 +94,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`92`	`94`	`auto ta = typed_array_cast<const int16_t>(typed_array);`
`93`	`95`	`for (auto item : ta)`
`94`	`96`	`{`
`95`		`- v.push_back(item);`
	`97`	`+ v.push_back(static_cast<value_type>(item));`
`96`	`98`	`}`
`97`	`99`	`break;`
`98`	`100`	`}`
`@@ -101,7 +103,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`101`	`103`	`auto ta = typed_array_cast<const int32_t>(typed_array);`
`102`	`104`	`for (auto item : ta)`
`103`	`105`	`{`
`104`		`- v.push_back(item);`
	`106`	`+ v.push_back(static_cast<value_type>(item));`
`105`	`107`	`}`
`106`	`108`	`break;`
`107`	`109`	`}`
`@@ -110,7 +112,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`110`	`112`	`auto ta = typed_array_cast<const int64_t>(typed_array);`
`111`	`113`	`for (auto item : ta)`
`112`	`114`	`{`
`113`		`- v.push_back(item);`
	`115`	`+ v.push_back(static_cast<value_type>(item));`
`114`	`116`	`}`
`115`	`117`	`break;`
`116`	`118`	`}`
`@@ -119,7 +121,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`119`	`121`	`auto ta = typed_array_cast<const int16_t>(typed_array);`
`120`	`122`	`for (auto item : ta)`
`121`	`123`	`{`
`122`		`- v.push_back(item);`
	`124`	`+ v.push_back(static_cast<value_type>(item));`
`123`	`125`	`}`
`124`	`126`	`break;`
`125`	`127`	`}`
`@@ -128,7 +130,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`128`	`130`	`auto ta = typed_array_cast<const float>(typed_array);`
`129`	`131`	`for (auto item : ta)`
`130`	`132`	`{`
`131`		`- v.push_back(item);`
	`133`	`+ v.push_back(static_cast<value_type>(item));`
`132`	`134`	`}`
`133`	`135`	`break;`
`134`	`136`	`}`
`@@ -137,7 +139,7 @@ read_typed_array(jsoncons::span<uint8_t> typed_array, typed_array_element_type e`
`137`	`139`	`auto ta = typed_array_cast<const double>(typed_array);`
`138`	`140`	`for (auto item : ta)`
`139`	`141`	`{`
`140`		`- v.push_back(item);`
	`142`	`+ v.push_back(static_cast<value_type>(item));`
`141`	`143`	`}`
`142`	`144`	`break;`
`143`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ class basic_staj_cursor`
`315`	`315`	`return typed_array_element_type{};`
`316`	`316`	`}`
`317`	`317`
`318`		`- virtual jsoncons::span<uint8_t> typed_array() const`
	`318`	`+ virtual jsoncons::span<uint8_t> typed_array()`
`319`	`319`	`{`
`320`	`320`	`return jsoncons::span<uint8_t>{};`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class basic_cbor_cursor : public basic_staj_cursor<char>, private virtual ser_co`
`173`	`173`	`return parser_.element_type();`
`174`	`174`	`}`
`175`	`175`
`176`		`- jsoncons::span<uint8_t> typed_array() const final`
	`176`	`+ jsoncons::span<uint8_t> typed_array() final`
`177`	`177`	`{`
`178`	`178`	`return parser_.typed_array();`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ class basic_cbor_parser : public ser_context`
`289`	`289`	`return element_type_;`
`290`	`290`	`}`
`291`	`291`
`292`		`- jsoncons::span<uint8_t> typed_array() const`
	`292`	`+ jsoncons::span<uint8_t> typed_array()`
`293`	`293`	`{`
`294`	`294`	`return typed_array_;`
`295`	`295`	`}`