j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🐛 fixed CBOR code and added test cases

Browse source
This commit is contained in:
Niels Lohmann 2016-12-10 23:12:57 +01:00
parent 7e5d6af5c1
commit 41673e8fed
3 changed files with 118 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/json.hpp
View file

@ -7085,25 +7085,25 @@ class basic_json
{
idx += 1; // skip content byte
// must be uint8_t !
return -1 - get_from_vector<uint8_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint8_t>(v, current_idx);
}
case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
{
idx += 2; // skip 2 content bytes
return -1 - get_from_vector<int16_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint16_t>(v, current_idx);
}
case 0x3a: // Negative integer -1-n (four-byte uint32_t follows)
{
idx += 4; // skip 4 content bytes
return -1 - get_from_vector<int32_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint32_t>(v, current_idx);
}
case 0x3b: // Negative integer -1-n (eight-byte uint64_t follows)
{
idx += 8; // skip 8 content bytes
return -1 - get_from_vector<int64_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint64_t>(v, current_idx);
}
// UTF-8 string (0x00..0x17 bytes follow)

8
src/json.hpp.re2c
View file

@ -7085,25 +7085,25 @@ class basic_json
{
idx += 1; // skip content byte
// must be uint8_t !
return -1 - get_from_vector<uint8_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint8_t>(v, current_idx);
}
case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
{
idx += 2; // skip 2 content bytes
return -1 - get_from_vector<int16_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint16_t>(v, current_idx);
}
case 0x3a: // Negative integer -1-n (four-byte uint32_t follows)
{
idx += 4; // skip 4 content bytes
return -1 - get_from_vector<int32_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint32_t>(v, current_idx);
}
case 0x3b: // Negative integer -1-n (eight-byte uint64_t follows)
{
idx += 8; // skip 8 content bytes
return -1 - get_from_vector<int64_t>(v, current_idx);
return static_cast<number_integer_t>(-1) - get_from_vector<uint64_t>(v, current_idx);
}
// UTF-8 string (0x00..0x17 bytes follow)