BSON: support doubles
This commit is contained in:
parent
9a0dddc5d2
commit
0c0f2e44b5
4 changed files with 115 additions and 31 deletions
|
@ -137,8 +137,6 @@ class binary_reader
|
|||
}
|
||||
|
||||
/*!
|
||||
@param[in] len the length of the array or std::size_t(-1) for an
|
||||
array of indefinite size
|
||||
@return whether array creation completed
|
||||
*/
|
||||
bool get_bson_str(string_t& result)
|
||||
|
@ -179,15 +177,19 @@ class binary_reader
|
|||
string_t key;
|
||||
get_bson_str(key);
|
||||
sax->key(key);
|
||||
sax->boolean(static_cast<bool>(get()));
|
||||
} break;
|
||||
double number;
|
||||
get_number_little_endian(number);
|
||||
sax->number_float(static_cast<number_float_t>(number), "");
|
||||
}
|
||||
break;
|
||||
case 0x08:
|
||||
{
|
||||
string_t key;
|
||||
get_bson_str(key);
|
||||
sax->key(key);
|
||||
sax->boolean(static_cast<bool>(get()));
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -676,8 +676,7 @@ class binary_writer
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
oa->write_character(static_cast<CharType>(0x08)); // boolean
|
||||
oa->write_characters(
|
||||
|
@ -687,6 +686,32 @@ class binary_writer
|
|||
return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u;
|
||||
}
|
||||
|
||||
std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
oa->write_character(static_cast<CharType>(0x01)); // boolean
|
||||
oa->write_characters(
|
||||
reinterpret_cast<const CharType*>(name.c_str()),
|
||||
name.size() + 1u);
|
||||
write_number_little_endian(j.m_value.number_float);
|
||||
return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u;
|
||||
}
|
||||
|
||||
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
switch (j.type())
|
||||
{
|
||||
default:
|
||||
JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format"));
|
||||
break;
|
||||
case value_t::boolean:
|
||||
return write_bson_boolean(name, j);
|
||||
case value_t::number_float:
|
||||
return write_bson_double(name, j);
|
||||
};
|
||||
|
||||
return 0ul;
|
||||
}
|
||||
|
||||
/*!
|
||||
@param[in] j JSON value to serialize
|
||||
@pre j.type() == value_t::object
|
||||
|
|
|
@ -6121,8 +6121,6 @@ class binary_reader
|
|||
}
|
||||
|
||||
/*!
|
||||
@param[in] len the length of the array or std::size_t(-1) for an
|
||||
array of indefinite size
|
||||
@return whether array creation completed
|
||||
*/
|
||||
bool get_bson_str(string_t& result)
|
||||
|
@ -6158,6 +6156,16 @@ class binary_reader
|
|||
{
|
||||
switch (entry_type)
|
||||
{
|
||||
case 0x01:
|
||||
{
|
||||
string_t key;
|
||||
get_bson_str(key);
|
||||
sax->key(key);
|
||||
double number;
|
||||
get_number_little_endian(number);
|
||||
sax->number_float(static_cast<number_float_t>(number), "");
|
||||
}
|
||||
break;
|
||||
case 0x08:
|
||||
{
|
||||
string_t key;
|
||||
|
@ -8461,8 +8469,7 @@ class binary_writer
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
oa->write_character(static_cast<CharType>(0x08)); // boolean
|
||||
oa->write_characters(
|
||||
|
@ -8472,6 +8479,32 @@ class binary_writer
|
|||
return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u;
|
||||
}
|
||||
|
||||
std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
oa->write_character(static_cast<CharType>(0x01)); // boolean
|
||||
oa->write_characters(
|
||||
reinterpret_cast<const CharType*>(name.c_str()),
|
||||
name.size() + 1u);
|
||||
write_number_little_endian(j.m_value.number_float);
|
||||
return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u;
|
||||
}
|
||||
|
||||
std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j)
|
||||
{
|
||||
switch (j.type())
|
||||
{
|
||||
default:
|
||||
JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format"));
|
||||
break;
|
||||
case value_t::boolean:
|
||||
return write_bson_boolean(name, j);
|
||||
case value_t::number_float:
|
||||
return write_bson_double(name, j);
|
||||
};
|
||||
|
||||
return 0ul;
|
||||
}
|
||||
|
||||
/*!
|
||||
@param[in] j JSON value to serialize
|
||||
@pre j.type() == value_t::object
|
||||
|
|
|
@ -136,28 +136,52 @@ TEST_CASE("BSON")
|
|||
CHECK(json::from_bson(result, true, false) == j);
|
||||
}
|
||||
|
||||
// SECTION("non-empty object with double")
|
||||
// {
|
||||
// json j =
|
||||
// {
|
||||
// { "entry", true }
|
||||
// };
|
||||
SECTION("non-empty object with bool")
|
||||
{
|
||||
json j =
|
||||
{
|
||||
{ "entry", false }
|
||||
};
|
||||
|
||||
// std::vector<uint8_t> expected =
|
||||
// {
|
||||
// 0x14, 0x00, 0x00, 0x00, // size (little endian)
|
||||
// 0x01, /// entry: double
|
||||
// 'e', 'n', 't', 'r', 'y', '\x00',
|
||||
// 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40,
|
||||
// 0x00 // end marker
|
||||
// };
|
||||
std::vector<uint8_t> expected =
|
||||
{
|
||||
0x0D, 0x00, 0x00, 0x00, // size (little endian)
|
||||
0x08, // entry: boolean
|
||||
'e', 'n', 't', 'r', 'y', '\x00',
|
||||
0x00, // value = false
|
||||
0x00 // end marker
|
||||
};
|
||||
|
||||
// const auto result = json::to_bson(j);
|
||||
// CHECK(result == expected);
|
||||
const auto result = json::to_bson(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
// // roundtrip
|
||||
// //CHECK(json::from_bson(result) == j);
|
||||
// //CHECK(json::from_bson(result, true, false) == j);
|
||||
// }
|
||||
// roundtrip
|
||||
CHECK(json::from_bson(result) == j);
|
||||
CHECK(json::from_bson(result, true, false) == j);
|
||||
}
|
||||
|
||||
SECTION("non-empty object with double")
|
||||
{
|
||||
json j =
|
||||
{
|
||||
{ "entry", 4.2 }
|
||||
};
|
||||
|
||||
std::vector<uint8_t> expected =
|
||||
{
|
||||
0x14, 0x00, 0x00, 0x00, // size (little endian)
|
||||
0x01, /// entry: double
|
||||
'e', 'n', 't', 'r', 'y', '\x00',
|
||||
0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40,
|
||||
0x00 // end marker
|
||||
};
|
||||
|
||||
const auto result = json::to_bson(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
// roundtrip
|
||||
CHECK(json::from_bson(result) == j);
|
||||
CHECK(json::from_bson(result, true, false) == j);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue