move sub-functions of value impls to concrete types

Signed-off-by: Folling <mail@folling.io>

src/values/number_value.cpp

@@ -1,5 +1,7 @@
 #include "ikarus/values/number_value.h"
 
+#include <boost/functional/overloaded_function.hpp>
+
 #include <values/number_value.hpp>
 #include <values/value_base.hpp>
 
@@ -30,6 +32,39 @@ void ikarus_number_value_insert(IkarusNumberValue * value, size_t idx, long doub
     return ikarus_value_base_insert(value, idx, new_data);
 }
 
+void ikarus_number_value_clear(IkarusNumberValue * value) {
+    return ikarus_value_base_clear(value);
+}
+
+bool ikarus_number_value_is_undefined(IkarusNumberValue const * value) {
+    return ikarus_value_base_is_undefined(value);
+}
+
+void ikarus_number_value_set_undefined(IkarusNumberValue * value, bool undefined) {
+    return ikarus_value_base_set_undefined(value, undefined);
+}
+
+char const * ikarus_number_value_to_string(IkarusNumberValue const * value) {
+    return boost::variant2::visit(
+        boost::make_overloaded_function(
+            [](boost::variant2::monostate const&) { return nullptr; }, [](auto const& data) { return fmt::join(data, ", "); }
+        ),
+        value->data
+    );
+}
+
+bool ikarus_number_value_is_equal(IkarusNumberValue const * lhs, IkarusNumberValue const * rhs) {
+    return ikarus_value_base_is_equal(lhs, rhs);
+}
+
+IkarusNumberValue * ikarus_number_value_copy(IkarusNumberValue const * value) {
+    return ikarus_value_base_copy(value);
+}
+
 struct IkarusValue * ikarus_number_value_to_value(IkarusNumberValue * value) {
     return ikarus_value_base_to_value(value);
 }
+
+struct IkarusValue const * ikarus_number_value_to_value_const(IkarusNumberValue const * value) {
+    return ikarus_value_base_to_value_const(value);
+}

src/values/number_value.hpp

@@ -21,5 +21,7 @@ public:
     ~IkarusNumberValue() override = default;
 
 public:
-    boost::variant2::variant<boost::variant2::monostate, boost::container::vector<data_type>> data{};
+    boost::variant2::
+        variant<boost::variant2::monostate, boost::container::small_vector<data_type, SMALL_VEC_VALUE_SIZE>>
+            data{};
 };

src/values/text_value.cpp

@@ -1,5 +1,7 @@
 #include "ikarus/values/text_value.h"
 
+#include <boost/functional/overloaded_function.hpp>
+
 #include <values/text_value.hpp>
 #include <values/value_base.hpp>
 
@@ -30,6 +32,39 @@ void ikarus_text_value_insert(IkarusTextValue * value, size_t idx, char const *
     return ikarus_value_base_insert(value, idx, new_data);
 }
 
+void ikarus_text_value_clear(IkarusTextValue * value) {
+    return ikarus_value_base_clear(value);
+}
+
+bool ikarus_text_value_is_undefined(IkarusTextValue const * value) {
+    return ikarus_value_base_is_undefined(value);
+}
+
+void ikarus_text_value_set_undefined(IkarusTextValue * value, bool undefined) {
+    return ikarus_value_base_set_undefined(value, undefined);
+}
+
+char const * ikarus_text_value_to_string(IkarusTextValue const * value) {
+    return boost::variant2::visit(
+        boost::make_overloaded_function(
+            [](boost::variant2::monostate const&) { return nullptr; }, [](auto const& data) { return fmt::join(data, ", "); }
+        ),
+        value->data
+    );
+}
+
+bool ikarus_text_value_is_equal(IkarusTextValue const * lhs, IkarusTextValue const * rhs) {
+    return ikarus_value_base_is_equal(lhs, rhs);
+}
+
+IkarusTextValue * ikarus_text_value_copy(IkarusTextValue const * value) {
+    return ikarus_value_base_copy(value);
+}
+
 struct IkarusValue * ikarus_text_value_to_value(IkarusTextValue * value) {
     return ikarus_value_base_to_value(value);
 }
+
+struct IkarusValue const * ikarus_text_value_to_value_const(IkarusTextValue const * value) {
+    return ikarus_value_base_to_value_const(value);
+}

src/values/text_value.hpp

@@ -20,5 +20,6 @@ public:
     ~IkarusTextValue() override = default;
 
 public:
-    boost::variant2::variant<boost::variant2::monostate, boost::container::vector<data_type>> data{};
+    boost::variant2::variant<boost::variant2::monostate, boost::container::small_vector<data_type, SMALL_VEC_VALUE_SIZE>> data{
+    };
 };

src/values/toggle_value.cpp

@@ -1,5 +1,8 @@
 #include "ikarus/values/toggle_value.h"
 
+#include <boost/functional/overloaded_function.hpp>
+#include <boost/range/adaptors.hpp>
+
 #include <values/toggle_value.hpp>
 #include <values/value_base.hpp>
 
@@ -30,6 +33,44 @@ void ikarus_toggle_value_insert(IkarusToggleValue * value, size_t idx, bool new_
     return ikarus_value_base_insert(value, idx, new_data);
 }
 
+void ikarus_toggle_value_clear(IkarusToggleValue * value) {
+    return ikarus_value_base_clear(value);
+}
+
+bool ikarus_toggle_value_is_undefined(IkarusToggleValue const * value) {
+    return ikarus_value_base_is_undefined(value);
+}
+
+void ikarus_toggle_value_set_undefined(IkarusToggleValue * value, bool undefined) {
+    return ikarus_value_base_set_undefined(value, undefined);
+}
+
+char const * ikarus_toggle_value_to_string(IkarusToggleValue const * value) {
+    return boost::variant2::visit(
+        boost::make_overloaded_function(
+            [](boost::variant2::monostate const&) { return nullptr; },
+            [](auto const& data) {
+                return fmt::join(
+                    data | boost::adaptors::transformed([](auto const& bool_value) { return bool_value ? "✓" : "✗"; }), ", "
+                );
+            }
+        ),
+        value->data
+    );
+}
+
+bool ikarus_toggle_value_is_equal(IkarusToggleValue const * lhs, IkarusToggleValue const * rhs) {
+    return ikarus_value_base_is_equal(lhs, rhs);
+}
+
+IkarusToggleValue * ikarus_toggle_value_copy(IkarusToggleValue const * value) {
+    return ikarus_value_base_copy(value);
+}
+
 struct IkarusValue * ikarus_toggle_value_to_value(IkarusToggleValue * value) {
     return ikarus_value_base_to_value(value);
 }
+
+struct IkarusValue const * ikarus_toggle_value_to_value_const(IkarusToggleValue const * value) {
+    return ikarus_value_base_to_value_const(value);
+}

src/values/toggle_value.hpp

@@ -20,5 +20,6 @@ public:
     ~IkarusToggleValue() override = default;
 
 public:
-    boost::variant2::variant<boost::variant2::monostate, boost::container::vector<data_type>> data{};
+    boost::variant2::variant<boost::variant2::monostate, boost::container::small_vector<data_type, SMALL_VEC_VALUE_SIZE>> data{
+    };
 };

src/values/value.cpp

@@ -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 *),

src/values/value.hpp

@@ -8,6 +8,7 @@
 struct IkarusValue {
 public:
     using Data = boost::variant2::variant<struct IkarusToggleValue *, struct IkarusNumberValue *, struct IkarusTextValue *>;
+    constexpr auto SMALL_VEC_VALUE_SIZE = 8;
 
 public:
     explicit IkarusValue(Data data);

src/values/value_base.hpp

@@ -39,7 +39,43 @@ void ikarus_value_base_insert(V * value, size_t idx, typename V::data_type new_d
     }
 }
 
+template<typename V>
+void ikarus_value_base_clear(V * value) {
+    if (auto * data = value->data.template get_if<std::vector<typename V::data_type>>(); data != nullptr) {
+        data->clear();
+    }
+}
+
+template<typename V>
+bool ikarus_value_base_is_undefined(V const * value) {
+    return boost::variant2::holds_alternative<boost::variant2::monostate>(value->data);
+}
+
+template<typename V>
+void ikarus_value_base_set_undefined(V * value, bool undefined) {
+    if (undefined) {
+        value->data = boost::variant2::monostate{};
+    } else {
+        value->data = typename V::data_type{};
+    }
+}
+
+template<typename V>
+bool ikarus_value_base_is_equal(V const * lhs, V const * rhs) {
+    return lhs->data == rhs->data;
+}
+
+template<typename V>
+V * ikarus_value_base_copy(V const * value) {
+    return new V{*value};
+}
+
 template<typename V>
 struct IkarusValue * ikarus_value_base_to_value(V * value) {
     return static_cast<IkarusValue *>(value);
 }
+
+template<typename V>
+struct IkarusValue const * ikarus_value_base_to_value_const(V const * value) {
+    return static_cast<IkarusValue const *>(value);
+}