Ikarus/libikarus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move sub-functions of value impls to concrete types

Browse source 
Signed-off-by: Folling <mail@folling.io>
This commit is contained in:
Folling 2023-12-03 18:44:09 +01:00 • committed by Folling
parent 7536cf4c7c
commit 03c18debec
No known key found for this signature in database
14 changed files with 339 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/values/value.cpp
View file

@ -18,12 +18,12 @@ IkarusValue::IkarusValue(Data data):
data(data) {}
cppbase::Result<IkarusValue, IkarusValue::FromJsonError> IkarusValue::from_json(boost::json::value const& json) {
boost::int64_t const * type = nullptr;
boost::json::value const * data = nullptr;
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;
if (auto const * type_value = obj->if_contains("type"); type_value == nullptr) {
return cppbase::err(FromJsonError{});
} else if (type = type_value->if_int64(); type == nullptr) {
@ -34,36 +34,28 @@ cppbase::Result<IkarusValue, IkarusValue::FromJsonError> IkarusValue::from_json(
return cppbase::err(FromJsonError{});
}
auto create_value = [data]<typename T>() -> cppbase::Result<IkarusValue *, FromJsonError> {
auto * ret = new T{};
auto res = boost::json::try_value_to<boost::container::vector<typename T::data_type>>(*data);
if (res.has_error()) {
return cppbase::err(FromJsonError{});
}
ret->data = std::move(res.value());
return cppbase::ok(ret);
};
switch (*type) {
case IkarusPropertyType_Toggle: {
auto * ret = new IkarusToggleValue{};
auto res = boost::json::try_value_to<boost::container::vector<IkarusToggleValue::data_type>>(*data);
if (res.has_error()) {
return cppbase::err(FromJsonError{});
}
ret->data = std::move(res.value());
return create_value.operator()<IkarusToggleValue>();
}
case IkarusPropertyType_Number: {
auto * ret = new IkarusNumberValue{};
auto res = boost::json::try_value_to<boost::container::vector<IkarusNumberValue::data_type>>(*data);
if (res.has_error()) {
return cppbase::err(FromJsonError{});
}
ret->data = std::move(res.value());
return create_value.operator()<IkarusNumberValue>();
}
case IkarusPropertyType_Text: {
auto * ret = new IkarusTextValue{};
auto res = boost::json::try_value_to<boost::container::vector<IkarusTextValue::data_type>>(*data);
if (res.has_error()) {
return cppbase::err(FromJsonError{});
}
ret->data = std::move(res.value());
return create_value.operator()<IkarusTextValue>();
}
default: {
return cppbase::err(FromJsonError{});
@ -90,36 +82,6 @@ boost::json::value IkarusValue::to_json() const {
};
}
bool ikarus_value_is_indeterminate(IkarusValue const * value) {
return boost::variant2::visit(
[](auto const * value) { return boost::variant2::holds_alternative<boost::variant2::monostate>(value->data); },
value->data
);
}
void ikarus_value_set_indeterminate(IkarusValue * value, bool indeterminate) {
if (indeterminate) {
return boost::variant2::visit([](auto const * value) { value->data = boost::variant2::monostate{}; }, value->data);
}
return boost::variant2::visit(
[](auto const * value) { value->data = boost::remove_pointer_t<decltype(value)>::data_type{}; }, value->data
);
}
char const * ikarus_value_to_string(IkarusValue const * value) {
auto const str = boost::variant2::visit(
boost::make_overloaded_function(
[](IkarusToggleValue const * toggle_value) -> std::string { return toggle_value->data ? "true" : "false"; },
[](IkarusNumberValue const * number_value) -> std::string { return fmt::format("{}", number_value->data); },
[](IkarusTextValue const * text_value) -> std::string { return fmt::format("{}", text_value->data); }
),
value->data
);
return strdup(str.data());
}
void ikarus_value_visit(
IkarusValue * value,
void (*toggle_visitor)(IkarusToggleValue *, void *),