riyyi/ruc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Json: Add support for more integral types

Browse Source
This commit is contained in:
Riyyi
2022-09-21 17:24:38 +02:00
parent cacd3ca8fd
commit 228e290b94
2 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ruc/json/fromjson.h
+25 -3
View File
@@ -7,7 +7,8 @@
#pragma once #pragma once
#include <algorithm> // transform #include <algorithm> // transform
#include <cstddef> // nullptr_t #include <cstddef> // nullptr_t, size_t
#include <cstdint> // int32_t, int64_t, uint32_t
#include <map> #include <map>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@@ -45,10 +46,31 @@ void fromJson(const Json& json, bool& boolean)
} }
template<typename Json> template<typename Json>
void fromJson(const Json& json, int& number) void fromJson(const Json& json, int32_t& number)
{ {
VERIFY(json.type() == Json::Type::Number); VERIFY(json.type() == Json::Type::Number);
number = (int)json.asDouble(); number = static_cast<int32_t>(json.asDouble());
}
template<typename Json>
void fromJson(const Json& json, uint32_t& number)
{
VERIFY(json.type() == Json::Type::Number);
number = static_cast<uint32_t>(json.asDouble());
}
template<typename Json>
void fromJson(const Json& json, int64_t& number)
{
VERIFY(json.type() == Json::Type::Number);
number = static_cast<int64_t>(json.asDouble());
}
template<typename Json>
void fromJson(const Json& json, size_t& number) // uint64_t
{
VERIFY(json.type() == Json::Type::Number);
number = static_cast<size_t>(json.asDouble());
} }
template<typename Json> template<typename Json>
src/ruc/json/tojson.h
+28 -4
View File
@@ -6,8 +6,8 @@
#pragma once #pragma once
#include <cassert> // assert #include <cstddef> // nullptr_t, size_t
#include <cstddef> // nullptr_t #include <cstdint> // int32_t, int64_t, uint32_t
#include <map> #include <map>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@@ -31,11 +31,35 @@ struct jsonConstructor {
} }
template<typename Json> template<typename Json>
static void construct(Json& json, int number) static void construct(Json& json, int32_t number)
{ {
json.destroy(); json.destroy();
json.m_type = Json::Type::Number; json.m_type = Json::Type::Number;
json.m_value.number = (double)number; json.m_value.number = static_cast<double>(number);
}
template<typename Json>
static void construct(Json& json, int64_t number)
{
json.destroy();
json.m_type = Json::Type::Number;
json.m_value.number = static_cast<double>(number);
}
template<typename Json>
static void construct(Json& json, uint32_t number)
{
json.destroy();
json.m_type = Json::Type::Number;
json.m_value.number = static_cast<double>(number);
}
template<typename Json>
static void construct(Json& json, size_t number)
{
json.destroy();
json.m_type = Json::Type::Number;
json.m_value.number = static_cast<double>(number);
} }
template<typename Json> template<typename Json>