diff --git a/.idea/editor.xml b/.idea/editor.xml
index dfdaaeb..5fff85e 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -240,247 +240,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8abd3a5..5b76625 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ macro(compile_options target_name)
sanitizers(${target_name})
endmacro()
-project(blt-gp VERSION 0.3.20)
+project(blt-gp VERSION 0.3.21)
include(CTest)
diff --git a/include/blt/gp/operations.h b/include/blt/gp/operations.h
index e0dd7c2..c7f3d86 100644
--- a/include/blt/gp/operations.h
+++ b/include/blt/gp/operations.h
@@ -65,7 +65,9 @@ namespace blt::gp
{
if constexpr (blt::gp::detail::has_func_drop_v)
{
- read_allocator.from>(offset).drop();
+ auto [type, ptr] = read_allocator.access_pointer>(offset);
+ if (!ptr.bit(0))
+ type.drop();
}
}
diff --git a/include/blt/gp/stack.h b/include/blt/gp/stack.h
index cc2620c..ca051b5 100644
--- a/include/blt/gp/stack.h
+++ b/include/blt/gp/stack.h
@@ -199,7 +199,7 @@ namespace blt::gp
}
template >
- T& from(const size_t bytes)
+ T& from(const size_t bytes) const
{
static_assert(std::is_trivially_copyable_v && "Type must be bitwise copyable!");
static_assert(alignof(NO_REF) <= gp::detail::MAX_ALIGNMENT && "Type alignment must not be greater than the max alignment!");
@@ -223,11 +223,11 @@ namespace blt::gp
}
template
- [[nodiscard]] mem::pointer_storage& access_pointer(const size_t bytes) const
+ [[nodiscard]] std::pair&> access_pointer(const size_t bytes) const
{
auto& type_ref = from(bytes);
- return *std::launder(
- reinterpret_cast*>(reinterpret_cast(&type_ref) + detail::aligned_size(sizeof(T))));
+ return {type_ref, *std::launder(
+ reinterpret_cast*>(reinterpret_cast(&type_ref) + detail::aligned_size(sizeof(T))))};
}
void pop_bytes(const size_t bytes)
diff --git a/include/blt/gp/tree.h b/include/blt/gp/tree.h
index bc4fa1b..2744012 100644
--- a/include/blt/gp/tree.h
+++ b/include/blt/gp/tree.h
@@ -233,24 +233,13 @@ namespace blt::gp
break;
if (op_it->is_value())
{
- if (op_it->get_flags().is_ephemeral() && op_it->has_ephemeral_drop())
- {
- // BLT_TRACE("%lu %lu %lu", total_op_bytes, values.bytes_in_head(), values.bytes_in_head() - total_op_bytes);
- auto& ptr = values.access_pointer_forward(total_op_bytes, op_it->type_size());
- --*ptr;
- // if (*ptr == 0)
- // delete *ptr;
- }
+ handle_refcount_decrement(op_it, total_op_bytes);
total_op_bytes += op_it->type_size();
}
*op_it = *copy_it;
if (copy_it->is_value())
{
- if (copy_it->get_flags().is_ephemeral() && copy_it->has_ephemeral_drop())
- {
- auto& ptr = copy.values.access_pointer_forward(total_copy_bytes, copy_it->type_size());
- ++*ptr;
- }
+ copy.handle_refcount_increment(copy_it, total_copy_bytes);
total_copy_bytes += copy_it->type_size();
}
++copy_it;
@@ -260,11 +249,7 @@ namespace blt::gp
{
if (op_it->is_value())
{
- if (op_it->get_flags().is_ephemeral() && op_it->has_ephemeral_drop())
- {
- auto& ptr = values.access_pointer_forward(total_op_bytes, op_it->type_size());
- --*ptr;
- }
+ handle_refcount_decrement(op_it, total_op_bytes);
total_op_bytes += op_it->type_size();
}
}
@@ -273,11 +258,7 @@ namespace blt::gp
{
if (copy_it->is_value())
{
- if (copy_it->get_flags().is_ephemeral() && copy_it->has_ephemeral_drop())
- {
- auto& ptr = copy.values.access_pointer_forward(total_copy_bytes, copy_it->type_size());
- ++*ptr;
- }
+ copy.handle_refcount_increment(copy_it, total_copy_bytes);
total_copy_bytes += copy_it->type_size();
}
operations.emplace_back(*copy_it);
@@ -509,6 +490,26 @@ namespace blt::gp
private:
void handle_operator_inserted(const op_container_t& op);
+ template
+ void handle_refcount_decrement(const Iter iter, const size_t forward_bytes) const
+ {
+ if (iter->get_flags().is_ephemeral() && iter->has_ephemeral_drop())
+ {
+ auto& ptr = values.access_pointer_forward(forward_bytes, iter->type_size());
+ --*ptr;
+ }
+ }
+
+ template
+ void handle_refcount_increment(const Iter iter, const size_t forward_bytes) const
+ {
+ if (iter->get_flags().is_ephemeral() && iter->has_ephemeral_drop())
+ {
+ auto& ptr = values.access_pointer_forward(forward_bytes, iter->type_size());
+ --*ptr;
+ }
+ }
+
template || std::is_null_pointer_v), bool> = true>
[[nodiscard]] evaluation_context& evaluate(const T& context) const
{
diff --git a/src/tree.cpp b/src/tree.cpp
index cd61338..d6e670f 100644
--- a/src/tree.cpp
+++ b/src/tree.cpp
@@ -500,11 +500,11 @@ namespace blt::gp
auto& ptr = values.access_pointer_forward(total_bytes, op.type_size());
--*ptr;
// BLT_TRACE(ptr->load());
- if (*ptr == 0)
- {
+ // if (*ptr == 0)
+ // {
// BLT_TRACE("Deleting pointers!");
// delete ptr.get();
- }
+ // }
}
total_bytes += op.type_size();
}