multi dim cbor tests

danielaparker · danielaparker · commit 4a7fde58e3bc · 2026-05-12T15:57:00.000-04:00
diff --git a/include/jsoncons_ext/cbor/cbor_parser.hpp b/include/jsoncons_ext/cbor/cbor_parser.hpp
@@ -477,7 +477,7 @@ class basic_cbor_parser : public ser_context
         {
             case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
             {
-                uint64_t val = read_uint64_value(ec);
+                uint64_t val = read_uint64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -543,7 +543,7 @@ class basic_cbor_parser : public ser_context
             }
             case jsoncons::cbor::detail::cbor_major_type::negative_integer:
             {
-                int64_t val = read_int64_value(ec);
+                int64_t val = read_int64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -625,7 +625,7 @@ class basic_cbor_parser : public ser_context
                         break;
                     case 0x19: // Half-Precision Float (two-byte IEEE 754)
                     {
-                        uint64_t val = read_uint64_value(ec);
+                        uint64_t val = read_uint64(ec);
                         if (JSONCONS_UNLIKELY(ec))
                         {
                             return;
@@ -637,7 +637,7 @@ class basic_cbor_parser : public ser_context
                     case 0x1a: // Single-Precision Float (four-byte IEEE 754)
                     case 0x1b: // Double-Precision Float (eight-byte IEEE 754)
                     {
-                        double val = read_double_value(ec);
+                        double val = read_double(ec);
                         if (JSONCONS_UNLIKELY(ec))
                         {
                             return;
@@ -872,7 +872,7 @@ class basic_cbor_parser : public ser_context
 
     std::size_t read_size(std::error_code& ec)
     {
-        uint64_t u = read_uint64_value(ec);
+        uint64_t u = read_uint64(ec);
         if (JSONCONS_UNLIKELY(ec))
         {
             return 0;
@@ -1004,7 +1004,7 @@ class basic_cbor_parser : public ser_context
         } 
     }
 
-    uint64_t read_uint64_value(std::error_code& ec)
+    uint64_t read_uint64(std::error_code& ec)
     {
         uint64_t val = 0;
 
@@ -1066,7 +1066,7 @@ class basic_cbor_parser : public ser_context
         return val;
     }
 
-    int64_t read_int64_value(std::error_code& ec)
+    int64_t read_int64(std::error_code& ec)
     {
         int64_t val = 0;
 
@@ -1150,7 +1150,7 @@ class basic_cbor_parser : public ser_context
 
                 case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
                 {
-                    uint64_t x = read_uint64_value(ec);
+                    uint64_t x = read_uint64(ec);
                     if (JSONCONS_UNLIKELY(ec))
                     {
                         return 0;
@@ -1174,7 +1174,7 @@ class basic_cbor_parser : public ser_context
         return val;
     }
 
-    double read_double_value(std::error_code& ec)
+    double read_double(std::error_code& ec)
     {
         double val = 0;
 
@@ -1246,7 +1246,7 @@ class basic_cbor_parser : public ser_context
         {
             case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
             {
-                exponent = read_uint64_value(ec);
+                exponent = read_uint64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1255,7 +1255,7 @@ class basic_cbor_parser : public ser_context
             }
             case jsoncons::cbor::detail::cbor_major_type::negative_integer:
             {
-                exponent = read_int64_value(ec);
+                exponent = read_int64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1284,7 +1284,7 @@ class basic_cbor_parser : public ser_context
         {
             case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
             {
-                uint64_t val = read_uint64_value(ec);
+                uint64_t val = read_uint64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1294,7 +1294,7 @@ class basic_cbor_parser : public ser_context
             }
             case jsoncons::cbor::detail::cbor_major_type::negative_integer:
             {
-                int64_t val = read_int64_value(ec);
+                int64_t val = read_int64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1405,7 +1405,7 @@ class basic_cbor_parser : public ser_context
         {
             case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
             {
-                exponent = read_uint64_value(ec);
+                exponent = read_uint64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1414,7 +1414,7 @@ class basic_cbor_parser : public ser_context
             }
             case jsoncons::cbor::detail::cbor_major_type::negative_integer:
             {
-                exponent = read_int64_value(ec);
+                exponent = read_int64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1440,7 +1440,7 @@ class basic_cbor_parser : public ser_context
         {
             case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:
             {
-                uint64_t val = read_uint64_value(ec);
+                uint64_t val = read_uint64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1452,7 +1452,7 @@ class basic_cbor_parser : public ser_context
             }
             case jsoncons::cbor::detail::cbor_major_type::negative_integer:
             {
-                int64_t val = read_int64_value(ec);
+                int64_t val = read_int64(ec);
                 if (JSONCONS_UNLIKELY(ec))
                 {
                     return;
@@ -1557,7 +1557,7 @@ class basic_cbor_parser : public ser_context
 
         while (major_type == jsoncons::cbor::detail::cbor_major_type::semantic_tag)
         {
-            uint64_t val = read_uint64_value(ec);
+            uint64_t val = read_uint64(ec);
             if (JSONCONS_UNLIKELY(ec))
             {
                 return;

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ class basic_cbor_parser : public ser_context`
`477`	`477`	`{`
`478`	`478`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`479`	`479`	`{`
`480`		`- uint64_t val = read_uint64_value(ec);`
	`480`	`+ uint64_t val = read_uint64(ec);`
`481`	`481`	`if (JSONCONS_UNLIKELY(ec))`
`482`	`482`	`{`
`483`	`483`	`return;`
`@@ -543,7 +543,7 @@ class basic_cbor_parser : public ser_context`
`543`	`543`	`}`
`544`	`544`	`case jsoncons::cbor::detail::cbor_major_type::negative_integer:`
`545`	`545`	`{`
`546`		`- int64_t val = read_int64_value(ec);`
	`546`	`+ int64_t val = read_int64(ec);`
`547`	`547`	`if (JSONCONS_UNLIKELY(ec))`
`548`	`548`	`{`
`549`	`549`	`return;`
`@@ -625,7 +625,7 @@ class basic_cbor_parser : public ser_context`
`625`	`625`	`break;`
`626`	`626`	`case 0x19: // Half-Precision Float (two-byte IEEE 754)`
`627`	`627`	`{`
`628`		`- uint64_t val = read_uint64_value(ec);`
	`628`	`+ uint64_t val = read_uint64(ec);`
`629`	`629`	`if (JSONCONS_UNLIKELY(ec))`
`630`	`630`	`{`
`631`	`631`	`return;`
`@@ -637,7 +637,7 @@ class basic_cbor_parser : public ser_context`
`637`	`637`	`case 0x1a: // Single-Precision Float (four-byte IEEE 754)`
`638`	`638`	`case 0x1b: // Double-Precision Float (eight-byte IEEE 754)`
`639`	`639`	`{`
`640`		`- double val = read_double_value(ec);`
	`640`	`+ double val = read_double(ec);`
`641`	`641`	`if (JSONCONS_UNLIKELY(ec))`
`642`	`642`	`{`
`643`	`643`	`return;`
`@@ -872,7 +872,7 @@ class basic_cbor_parser : public ser_context`
`872`	`872`
`873`	`873`	`std::size_t read_size(std::error_code& ec)`
`874`	`874`	`{`
`875`		`- uint64_t u = read_uint64_value(ec);`
	`875`	`+ uint64_t u = read_uint64(ec);`
`876`	`876`	`if (JSONCONS_UNLIKELY(ec))`
`877`	`877`	`{`
`878`	`878`	`return 0;`
`@@ -1004,7 +1004,7 @@ class basic_cbor_parser : public ser_context`
`1004`	`1004`	`}`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`		`- uint64_t read_uint64_value(std::error_code& ec)`
	`1007`	`+ uint64_t read_uint64(std::error_code& ec)`
`1008`	`1008`	`{`
`1009`	`1009`	`uint64_t val = 0;`
`1010`	`1010`
`@@ -1066,7 +1066,7 @@ class basic_cbor_parser : public ser_context`
`1066`	`1066`	`return val;`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`		`- int64_t read_int64_value(std::error_code& ec)`
	`1069`	`+ int64_t read_int64(std::error_code& ec)`
`1070`	`1070`	`{`
`1071`	`1071`	`int64_t val = 0;`
`1072`	`1072`
`@@ -1150,7 +1150,7 @@ class basic_cbor_parser : public ser_context`
`1150`	`1150`
`1151`	`1151`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`1152`	`1152`	`{`
`1153`		`- uint64_t x = read_uint64_value(ec);`
	`1153`	`+ uint64_t x = read_uint64(ec);`
`1154`	`1154`	`if (JSONCONS_UNLIKELY(ec))`
`1155`	`1155`	`{`
`1156`	`1156`	`return 0;`
`@@ -1174,7 +1174,7 @@ class basic_cbor_parser : public ser_context`
`1174`	`1174`	`return val;`
`1175`	`1175`	`}`
`1176`	`1176`
`1177`		`- double read_double_value(std::error_code& ec)`
	`1177`	`+ double read_double(std::error_code& ec)`
`1178`	`1178`	`{`
`1179`	`1179`	`double val = 0;`
`1180`	`1180`
`@@ -1246,7 +1246,7 @@ class basic_cbor_parser : public ser_context`
`1246`	`1246`	`{`
`1247`	`1247`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`1248`	`1248`	`{`
`1249`		`- exponent = read_uint64_value(ec);`
	`1249`	`+ exponent = read_uint64(ec);`
`1250`	`1250`	`if (JSONCONS_UNLIKELY(ec))`
`1251`	`1251`	`{`
`1252`	`1252`	`return;`
`@@ -1255,7 +1255,7 @@ class basic_cbor_parser : public ser_context`
`1255`	`1255`	`}`
`1256`	`1256`	`case jsoncons::cbor::detail::cbor_major_type::negative_integer:`
`1257`	`1257`	`{`
`1258`		`- exponent = read_int64_value(ec);`
	`1258`	`+ exponent = read_int64(ec);`
`1259`	`1259`	`if (JSONCONS_UNLIKELY(ec))`
`1260`	`1260`	`{`
`1261`	`1261`	`return;`
`@@ -1284,7 +1284,7 @@ class basic_cbor_parser : public ser_context`
`1284`	`1284`	`{`
`1285`	`1285`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`1286`	`1286`	`{`
`1287`		`- uint64_t val = read_uint64_value(ec);`
	`1287`	`+ uint64_t val = read_uint64(ec);`
`1288`	`1288`	`if (JSONCONS_UNLIKELY(ec))`
`1289`	`1289`	`{`
`1290`	`1290`	`return;`
`@@ -1294,7 +1294,7 @@ class basic_cbor_parser : public ser_context`
`1294`	`1294`	`}`
`1295`	`1295`	`case jsoncons::cbor::detail::cbor_major_type::negative_integer:`
`1296`	`1296`	`{`
`1297`		`- int64_t val = read_int64_value(ec);`
	`1297`	`+ int64_t val = read_int64(ec);`
`1298`	`1298`	`if (JSONCONS_UNLIKELY(ec))`
`1299`	`1299`	`{`
`1300`	`1300`	`return;`
`@@ -1405,7 +1405,7 @@ class basic_cbor_parser : public ser_context`
`1405`	`1405`	`{`
`1406`	`1406`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`1407`	`1407`	`{`
`1408`		`- exponent = read_uint64_value(ec);`
	`1408`	`+ exponent = read_uint64(ec);`
`1409`	`1409`	`if (JSONCONS_UNLIKELY(ec))`
`1410`	`1410`	`{`
`1411`	`1411`	`return;`
`@@ -1414,7 +1414,7 @@ class basic_cbor_parser : public ser_context`
`1414`	`1414`	`}`
`1415`	`1415`	`case jsoncons::cbor::detail::cbor_major_type::negative_integer:`
`1416`	`1416`	`{`
`1417`		`- exponent = read_int64_value(ec);`
	`1417`	`+ exponent = read_int64(ec);`
`1418`	`1418`	`if (JSONCONS_UNLIKELY(ec))`
`1419`	`1419`	`{`
`1420`	`1420`	`return;`
`@@ -1440,7 +1440,7 @@ class basic_cbor_parser : public ser_context`
`1440`	`1440`	`{`
`1441`	`1441`	`case jsoncons::cbor::detail::cbor_major_type::unsigned_integer:`
`1442`	`1442`	`{`
`1443`		`- uint64_t val = read_uint64_value(ec);`
	`1443`	`+ uint64_t val = read_uint64(ec);`
`1444`	`1444`	`if (JSONCONS_UNLIKELY(ec))`
`1445`	`1445`	`{`
`1446`	`1446`	`return;`
`@@ -1452,7 +1452,7 @@ class basic_cbor_parser : public ser_context`
`1452`	`1452`	`}`
`1453`	`1453`	`case jsoncons::cbor::detail::cbor_major_type::negative_integer:`
`1454`	`1454`	`{`
`1455`		`- int64_t val = read_int64_value(ec);`
	`1455`	`+ int64_t val = read_int64(ec);`
`1456`	`1456`	`if (JSONCONS_UNLIKELY(ec))`
`1457`	`1457`	`{`
`1458`	`1458`	`return;`
`@@ -1557,7 +1557,7 @@ class basic_cbor_parser : public ser_context`
`1557`	`1557`
`1558`	`1558`	`while (major_type == jsoncons::cbor::detail::cbor_major_type::semantic_tag)`
`1559`	`1559`	`{`
`1560`		`- uint64_t val = read_uint64_value(ec);`
	`1560`	`+ uint64_t val = read_uint64(ec);`
`1561`	`1561`	`if (JSONCONS_UNLIKELY(ec))`
`1562`	`1562`	`{`
`1563`	`1563`	`return;`