make values capable of being a list & add boost

Signed-off-by: Folling <mail@folling.io>
This commit is contained in:
folling 2023-11-28 11:05:53 +01:00 committed by Folling
parent 08ad2c5c66
commit 733b52575b
Signed by: folling
SSH key fingerprint: SHA256:S9qEx5WCFFLK49tE/LKnKuJYM5sw+++Dn6qJbbyxnCY
16 changed files with 315 additions and 140 deletions

View file

@ -8,6 +8,7 @@
#include <persistence/function_context.hpp>
#include <persistence/project.hpp>
#include <sys/stat.h>
#include <values/value.hpp>
IkarusProperty::IkarusProperty(IkarusProject * project, IkarusId id, Data data):
IkarusObject{project, id},
@ -121,6 +122,31 @@ IkarusPropertySource const * ikarus_property_get_source(IkarusProperty const * p
}
}
IkarusValue * ikarus_property_get_default_value(IkarusProperty const * property) {
LOG_VERBOSE("fetching property default value");
LOG_VERBOSE("project={};property={}", property->get_project()->get_path().c_str(), property->get_id());
auto * ctx = property->get_project()->get_function_context();
VTRY(
auto const value,
property->get_project()
->get_db()
->query_one<int>("SELECT `default_value` FROM `properties` WHERE `id` = ?", property->get_id())
.on_error([ctx](auto const& err) {
ctx->set_error(
fmt::format("failed to fetch property's default value: {}", err),
true,
IkarusErrorInfo_Source_SubSystem,
IkarusErrorInfo_Type_SubSystem_Database
);
})
);
return new IkarusValue(property->get_project(), value);
}
void ikarus_property_visit(
IkarusProperty * property,
void (*toggle_property_visitor)(struct IkarusToggleProperty *, void *),

View file

@ -1,6 +1,10 @@
#include "toggle_property.hpp"
IkarusToggleProperty::IkarusToggleProperty(IkarusProject * project, IkarusId id):
IkarusProperty{project, id, this} {
IkarusProperty{project, id, this} {}
IkarusToggleProperty * ikarus_toggle_property_create(
struct IkarusProject * project, char const * name, struct IkarusPropertySource * property_source
) {
}

View file

@ -1,8 +1,9 @@
CREATE TABLE `objects`
(
`do_not_access_rowid_alias` INTEGER PRIMARY KEY,
`object_type` INT NOT NULL,
`id` INT GENERATED ALWAYS AS (`do_not_access_rowid_alias` | (`object_type` << 56)) VIRTUAL,
`object_type` INT NOT NULL,
`id` INT GENERATED ALWAYS AS (`do_not_access_rowid_alias` | (`object_type` << 56)
) VIRTUAL,
`name` TEXT NOT NULL,
`information` TEXT NOT NULL
) STRICT;
@ -11,7 +12,7 @@ CREATE UNIQUE INDEX `object_id` ON `objects` (`id`);
CREATE INDEX `object_type` ON `objects` (`object_type`);
CREATE
VIRTUAL TABLE `objects_fts` USING fts5
VIRTUAL TABLE `objects_fts` USING fts5
(
`name`,
`information`,
@ -23,7 +24,7 @@ CREATE
"unicode61 remove_diacritics 2 tokenchars '-_'"
);
CREATE TABLE `blueprints`
CREATE TABLE `entities`
(
`id` INT,
@ -31,7 +32,7 @@ CREATE TABLE `blueprints`
FOREIGN KEY (`id`) REFERENCES `objects` (`id`) ON DELETE CASCADE
) WITHOUT ROWID, STRICT;
CREATE TABLE `entities`
CREATE TABLE `blueprints`
(
`id` INT,
@ -69,7 +70,7 @@ CREATE INDEX `properties_type` ON `properties` (`type`);
CREATE INDEX `properties_source` ON `properties` (`source`);
CREATE
VIRTUAL TABLE `property_default_value_fts` USING fts5
VIRTUAL TABLE `property_default_value_fts` USING fts5
(
`default_value`,
content=
@ -81,7 +82,7 @@ CREATE
);
CREATE
VIRTUAL TABLE `property_settings_fts` USING fts5
VIRTUAL TABLE `property_settings_fts` USING fts5
(
`settings`,
content=
@ -104,7 +105,7 @@ CREATE TABLE `values`
) WITHOUT ROWID, STRICT;
CREATE
VIRTUAL TABLE `values_fts` USING fts5
VIRTUAL TABLE `values_fts` USING fts5
(
`value`,
content=

View file

@ -2,25 +2,54 @@
#include <values/number_value.hpp>
IkarusNumberValue * ikarus_number_value_create(long double value) {
return new IkarusNumberValue{value};
IkarusNumberValue::IkarusNumberValue():
IkarusValue{this} {}
boost::container::vector<long double>& IkarusNumberValue::get_value() {
return _value;
}
boost::container::vector<long double> const& IkarusNumberValue::get_value() const {
return _value;
}
IkarusNumberValue * ikarus_number_value_create(long double * data, size_t data_size) {
auto * ret = new IkarusNumberValue{};
ikarus_number_value_set(ret, data, data_size);
return ret;
}
IkarusNumberValue * ikarus_number_value_create_indeterminate() {
auto * ret = new IkarusNumberValue{0.0};
auto * ret = new IkarusNumberValue{};
ret->set_intermediate(true);
return ret;
}
long double ikarus_number_value_get(IkarusNumberValue const * value) {
return value->get_value();
long double * ikarus_number_value_get(IkarusNumberValue * value, size_t * data_size_out) {
// NOLINTNEXTLINE(*-pro-type-const-cast)
return const_cast<long double *>(ikarus_number_value_get_const(value, data_size_out));
}
void ikarus_number_value_set(IkarusNumberValue * value, long double new_value) {
value->set_value(new_value);
long double const * ikarus_number_value_get_const(IkarusNumberValue const * value, size_t * data_size_out) {
if (data_size_out != nullptr) {
*data_size_out = value->get_value().size();
}
return value->get_value().data();
}
struct IkarusValue * ikarus_number_value_to_value(IkarusNumberValue * number_value) {
return static_cast<IkarusValue *>(number_value);
void ikarus_number_value_set(IkarusNumberValue * value, long double * new_data, size_t new_data_size) {
value->get_value().reserve(new_data_size);
for (auto i = 0; i < new_data_size; ++i) {
// NOLINTNEXTLINE(*-pro-bounds-pointer-arithmetic)
value->get_value().emplace_back(new_data[i]);
}
}
struct IkarusValue * ikarus_number_value_to_value(IkarusNumberValue * value) {
return static_cast<IkarusValue *>(value);
}

View file

@ -1,13 +1,14 @@
#pragma once
#include <vector>
#include <boost/container/vector.hpp>
#include <values/value.hpp>
/// \private
struct IkarusNumberValue final : IkarusValue {
public:
explicit IkarusNumberValue(long double value):
IkarusValue{this},
_value{value} {}
explicit IkarusNumberValue();
IkarusNumberValue(IkarusNumberValue const&) = default;
IkarusNumberValue(IkarusNumberValue&&) = default;
@ -18,14 +19,9 @@ public:
~IkarusNumberValue() override = default;
public:
[[nodiscard]] long double get_value() const {
return _value;
}
void set_value(long double value) {
_value = value;
}
[[nodiscard]] boost::container::vector<long double>& get_value();
[[nodiscard]] boost::container::vector<long double> const& get_value() const;
private:
long double _value;
boost::container::vector<long double> _value{};
};

View file

@ -1,26 +1,55 @@
#include "ikarus/values/text_value.h"
#include "text_value.hpp"
#include <values/text_value.hpp>
IkarusTextValue * ikarus_text_value_create(char const * value) {
return new IkarusTextValue{value};
IkarusTextValue::IkarusTextValue():
IkarusValue{this} {}
boost::container::vector<char const *>& IkarusTextValue::get_value() {
return _value;
}
boost::container::vector<char const *> const& IkarusTextValue::get_value() const {
return _value;
}
IkarusTextValue * ikarus_text_value_create(char const ** data, size_t data_size) {
auto * ret = new IkarusTextValue{};
ikarus_text_value_set(ret, data, data_size);
return ret;
}
IkarusTextValue * ikarus_text_value_create_indeterminate() {
auto * ret = new IkarusTextValue{""};
auto * ret = new IkarusTextValue{};
ret->set_intermediate(true);
return ret;
}
char const * ikarus_text_value_get(IkarusTextValue const * value) {
char ** ikarus_text_value_get(IkarusTextValue * value, size_t * data_size_out) {
// NOLINTNEXTLINE(*-pro-type-const-cast)
return const_cast<char **>(ikarus_text_value_get_const(value, data_size_out));
}
char const * const * ikarus_text_value_get_const(IkarusTextValue const * value, size_t * data_size_out) {
if (data_size_out != nullptr) {
*data_size_out = value->get_value().size();
}
return value->get_value().data();
}
void ikarus_text_value_set(IkarusTextValue * value, char const * new_value) {
value->set_value(new_value);
void ikarus_text_value_set(IkarusTextValue * value, char const ** new_data, size_t new_data_size) {
value->get_value().reserve(new_data_size);
for (auto i = 0; i < new_data_size; ++i) {
// NOLINTNEXTLINE(*-pro-bounds-pointer-arithmetic)
value->get_value().emplace_back(new_data[i]);
}
}
struct IkarusValue * ikarus_text_value_to_value(IkarusTextValue * text_value) {
return static_cast<IkarusValue *>(text_value);
struct IkarusValue * ikarus_text_value_to_value(IkarusTextValue * value) {
return static_cast<IkarusValue *>(value);
}

View file

@ -1,33 +1,28 @@
#pragma once
#include <string>
#include <vector>
#include <boost/container/vector.hpp>
#include <values/value.hpp>
/// \private
struct IkarusTextValue final : IkarusValue {
public:
explicit IkarusTextValue(std::string value):
IkarusValue{this},
_value(std::move(value)) {}
explicit IkarusTextValue();
IkarusTextValue(IkarusTextValue const&) = default;
IkarusTextValue(IkarusTextValue&&) noexcept = default;
IkarusTextValue(IkarusTextValue&&) = default;
IkarusTextValue& operator=(IkarusTextValue const&) = default;
IkarusTextValue& operator=(IkarusTextValue&&) noexcept = default;
IkarusTextValue& operator=(IkarusTextValue&&) = default;
~IkarusTextValue() override = default;
public:
[[nodiscard]] std::string_view get_value() const noexcept {
return _value;
}
void set_value(std::string_view value) {
_value = value;
}
[[nodiscard]] boost::container::vector<char const *>& get_value();
[[nodiscard]] boost::container::vector<char const *> const& get_value() const;
private:
std::string _value;
boost::container::vector<char const *> _value{};
};

View file

@ -1,26 +1,60 @@
#include "ikarus/values/toggle_value.h"
#include "toggle_value.hpp"
#include <values/toggle_value.hpp>
IkarusToggleValue * ikarus_toggle_value_create(bool value) {
return new IkarusToggleValue{value};
IkarusToggleValue::IkarusToggleValue():
IkarusValue{this} {}
boost::container::vector<bool>& IkarusToggleValue::get_value() {
return _value;
}
boost::container::vector<bool> const& IkarusToggleValue::get_value() const {
return _value;
}
IkarusToggleValue * ikarus_toggle_value_create(bool * data, size_t data_size) {
auto * ret = new IkarusToggleValue{};
ikarus_toggle_value_set(ret, data, data_size);
return ret;
}
IkarusToggleValue * ikarus_toggle_value_create_indeterminate() {
auto * ret = new IkarusToggleValue{false};
auto * ret = new IkarusToggleValue{};
ret->set_intermediate(true);
return ret;
}
bool ikarus_toggle_value_get(IkarusToggleValue const * value) {
return value->get_value();
bool * ikarus_toggle_value_get(IkarusToggleValue * value, size_t * data_size_out) {
// NOLINTNEXTLINE(*-pro-type-const-cast)
return const_cast<bool *>(ikarus_toggle_value_get_const(value, data_size_out));
}
void ikarus_toggle_value_set(IkarusToggleValue * value, bool new_value) {
value->set_value(new_value);
bool const * ikarus_toggle_value_get_const(IkarusToggleValue const * value, size_t * data_size_out) {
if (data_size_out != nullptr) {
*data_size_out = value->get_value().size();
}
return value->get_value().data();
}
struct IkarusValue * ikarus_toggle_value_to_value(IkarusToggleValue * toggle_value) {
return static_cast<IkarusValue *>(toggle_value);
void ikarus_toggle_value_set(IkarusToggleValue * value, bool * new_data, size_t new_data_size) {
if (new_data == nullptr || new_data_size == 0) {
value->get_value().clear();
return;
}
value->get_value().reserve(new_data_size);
for (auto i = 0; i < new_data_size; ++i) {
// NOLINTNEXTLINE(*-pro-bounds-pointer-arithmetic)
value->get_value().emplace_back(new_data[i]);
}
}
struct IkarusValue * ikarus_toggle_value_to_value(IkarusToggleValue * value) {
return static_cast<IkarusValue *>(value);
}

View file

@ -1,13 +1,14 @@
#pragma once
#include <vector>
#include <boost/container/vector.hpp>
#include <values/value.hpp>
/// \private
struct IkarusToggleValue final : IkarusValue {
public:
explicit IkarusToggleValue(bool value):
IkarusValue{this},
_value{value} {}
explicit IkarusToggleValue();
IkarusToggleValue(IkarusToggleValue const&) = default;
IkarusToggleValue(IkarusToggleValue&&) = default;
@ -18,14 +19,9 @@ public:
~IkarusToggleValue() override = default;
public:
[[nodiscard]] bool get_value() const {
return _value;
}
void set_value(bool value) {
_value = value;
}
[[nodiscard]] boost::container::vector<bool>& get_value();
[[nodiscard]] boost::container::vector<bool> const& get_value() const;
private:
bool _value;
boost::container::vector<bool> _value{};
};