add flatbuffers support and initial rewrite
Signed-off-by: Folling <mail@folling.io>
This commit is contained in:
parent
7e883d24eb
commit
98cb7a44ef
72 changed files with 3929 additions and 1403 deletions
|
|
@ -3,41 +3,53 @@
|
|||
#include <string>
|
||||
|
||||
#include <boost/container/small_vector.hpp>
|
||||
|
||||
// required for header-only inclusion
|
||||
#include "cppbase/templates.hpp"
|
||||
|
||||
#include <boost/json/src.hpp>
|
||||
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
// required for header-only inclusion
|
||||
#include <cppbase/templates.hpp>
|
||||
|
||||
#include <ikarus/values/number_value.hpp>
|
||||
#include <ikarus/values/text_value.hpp>
|
||||
#include <ikarus/values/toggle_value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
#include <ikarus/values/value_cardinality.h>
|
||||
#include <ikarus/values/value_type.h>
|
||||
|
||||
IkarusValue::IkarusValue(Data data):
|
||||
data(data) {}
|
||||
IkarusValue::IkarusValue(Data data, IkarusValueCardinality cardinality):
|
||||
data{data},
|
||||
cardinality{cardinality} {}
|
||||
|
||||
cppbase::Result<IkarusValue *, IkarusValue::FromJsonError> IkarusValue::from_json(boost::json::value json) {
|
||||
if (auto const * obj = json.if_object(); obj == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
} else {
|
||||
boost::int64_t const * type = nullptr;
|
||||
boost::json::value const * data = nullptr;
|
||||
int64_t const * type;
|
||||
int64_t const * cardinality;
|
||||
boost::json::value const * data;
|
||||
|
||||
if (auto const * type_value = obj->if_contains("type"); type_value == nullptr) {
|
||||
if (auto const * type_value = obj->if_contains(IKARUS_VALUE_JSON_TYPE_KEY); type_value == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
} else if (type = type_value->if_int64(); type == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
}
|
||||
|
||||
if (data = obj->if_contains("data"); data == nullptr) {
|
||||
if (auto const * cardinality_value = obj->if_contains(IKARUS_VALUE_JSON_CARDINALITY_KEY); cardinality_value == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
} else if (cardinality = cardinality_value->if_int64(); cardinality == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
} else if (*cardinality != IkarusValueCardinality_Single && *cardinality != IkarusValueCardinality_Multiple) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
}
|
||||
|
||||
auto create_value = [data]<typename T>() -> cppbase::Result<IkarusValue *, FromJsonError> {
|
||||
if (data = obj->if_contains(IKARUS_VALUE_JSON_DATA_KEY); data == nullptr) {
|
||||
return cppbase::err(FromJsonError{});
|
||||
}
|
||||
|
||||
auto create_value = [data, cardinality]<typename T>() -> cppbase::Result<IkarusValue *, FromJsonError> {
|
||||
T * ret = nullptr;
|
||||
|
||||
ret->cardinality = *cardinality;
|
||||
|
||||
if (data->is_null()) {
|
||||
ret = new T{};
|
||||
ret->data = boost::variant2::monostate{};
|
||||
|
|
@ -58,13 +70,13 @@ cppbase::Result<IkarusValue *, IkarusValue::FromJsonError> IkarusValue::from_jso
|
|||
};
|
||||
|
||||
switch (*type) {
|
||||
case IkarusPropertyType_Toggle: {
|
||||
case IkarusValueType_Toggle: {
|
||||
return create_value.operator()<IkarusToggleValue>();
|
||||
}
|
||||
case IkarusPropertyType_Number: {
|
||||
case IkarusValueType_Number: {
|
||||
return create_value.operator()<IkarusNumberValue>();
|
||||
}
|
||||
case IkarusPropertyType_Text: {
|
||||
case IkarusValueType_Text: {
|
||||
return create_value.operator()<IkarusTextValue>();
|
||||
}
|
||||
default: {
|
||||
|
|
@ -75,18 +87,18 @@ cppbase::Result<IkarusValue *, IkarusValue::FromJsonError> IkarusValue::from_jso
|
|||
}
|
||||
|
||||
boost::json::value IkarusValue::to_json() const {
|
||||
auto type = boost::variant2::visit(
|
||||
auto type = std::visit(
|
||||
cppbase::overloaded{
|
||||
[]([[maybe_unused]] IkarusToggleValue const * value) { return IkarusPropertyType_Toggle; },
|
||||
[]([[maybe_unused]] IkarusNumberValue const * value) { return IkarusPropertyType_Number; },
|
||||
[]([[maybe_unused]] IkarusTextValue const * value) { return IkarusPropertyType_Text; }
|
||||
[]([[maybe_unused]] IkarusToggleValue const * value) { return IkarusValueType_Toggle; },
|
||||
[]([[maybe_unused]] IkarusNumberValue const * value) { return IkarusValueType_Number; },
|
||||
[]([[maybe_unused]] IkarusTextValue const * value) { return IkarusValueType_Text; }
|
||||
},
|
||||
data
|
||||
);
|
||||
|
||||
auto data_json = boost::variant2::visit(
|
||||
auto data_json = std::visit(
|
||||
[]<typename T>(T const * value) -> boost::json::value {
|
||||
return boost::variant2::visit(
|
||||
return std::visit(
|
||||
cppbase::overloaded{
|
||||
[]([[maybe_unused]] boost::variant2::monostate const & data) -> boost::json::value { return nullptr; },
|
||||
[](auto const & data) -> boost::json::value { return boost::json::value_from(data); }
|
||||
|
|
@ -98,8 +110,9 @@ boost::json::value IkarusValue::to_json() const {
|
|||
);
|
||||
|
||||
return {
|
||||
{"type", type},
|
||||
{"data", data_json}
|
||||
{ IKARUS_VALUE_JSON_TYPE_KEY, type},
|
||||
{IKARUS_VALUE_JSON_CARDINALITY_KEY, cardinality},
|
||||
{ IKARUS_VALUE_JSON_DATA_KEY, data_json}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -110,7 +123,7 @@ void ikarus_value_visit(
|
|||
void (*text_visitor)(IkarusTextValue *, void *),
|
||||
void * data
|
||||
) {
|
||||
boost::variant2::visit(
|
||||
std::visit(
|
||||
cppbase::overloaded{
|
||||
[toggle_visitor, data](IkarusToggleValue * toggle_value) { toggle_visitor(toggle_value, data); },
|
||||
[number_visitor, data](IkarusNumberValue * number_value) { number_visitor(number_value, data); },
|
||||
|
|
@ -119,20 +132,3 @@ void ikarus_value_visit(
|
|||
value->data
|
||||
);
|
||||
}
|
||||
|
||||
void ikarus_value_visit_const(
|
||||
IkarusValue const * value,
|
||||
void (*toggle_visitor)(IkarusToggleValue const *, void *),
|
||||
void (*number_visitor)(IkarusNumberValue const *, void *),
|
||||
void (*text_visitor)(IkarusTextValue const *, void *),
|
||||
void * data
|
||||
) {
|
||||
boost::variant2::visit(
|
||||
cppbase::overloaded{
|
||||
[toggle_visitor, data](IkarusToggleValue const * toggle_value) { toggle_visitor(toggle_value, data); },
|
||||
[number_visitor, data](IkarusNumberValue const * number_value) { number_visitor(number_value, data); },
|
||||
[text_visitor, data](IkarusTextValue const * text_value) { text_visitor(text_value, data); }
|
||||
},
|
||||
value->data
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue