KPGPMC/furlang
5
3
Fork 2
Code Issues 11 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

refactor: rename thing_type to type

Browse Source 
Rename thing_type to type and use shared pointer instead of value in
thing.
This commit is contained in:
Aleksander Krajewski
2026-07-01 16:25:46 +02:00
parent 42f020977e
commit 482ab859ed
2 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
furvm/include/furvm/fwd.hpp
+5 -14
View File
@@ -141,27 +141,18 @@ using mod_h = handle<mod, refcount_header<mod_id>>;
// thing.hpp // thing.hpp
/** /**
* @enum thing_type_t * @enum type_t
* @brief Type of the thing's type. * @brief Type of the thing's type.
*/ */
enum class thing_type_t : std::uint32_t; enum class type_t : std::uint32_t;
/** /**
* @struct thing_type * @struct type
* @brief Thing type. * @brief Thing type.
*/ */
struct thing_type; struct type;
/** using type_p = std::shared_ptr<type>;
* @brief Thing type's identifier.
*/
using thing_type_id = std::uint32_t;
// TODO: Use generic header
/**
* @brief A handle to a thing type.
*/
using thing_type_h = handle<thing_type, refcount_header<thing_type_id>>;
/** /**
* @class bad_thing_access * @class bad_thing_access
furvm/include/furvm/thing.hpp
+34 -22
View File
@@ -18,12 +18,12 @@
namespace furvm { namespace furvm {
enum class thing_type_t : std::uint32_t { enum class type_t : std::uint32_t {
Primitive = 0, Primitive = 0,
}; };
struct thing_type { struct type {
thing_type_t type; type_t type;
std::uint64_t value; std::uint64_t value;
}; };
@@ -35,22 +35,22 @@ using long_t = std::int64_t; /**< An 8-byte integer. */
/** /**
* @brief A 1-byte integer thing type. * @brief A 1-byte integer thing type.
*/ */
static constexpr thing_type ByteType = { thing_type_t::Primitive, sizeof(byte_t) }; static constexpr type ByteType = { type_t::Primitive, sizeof(byte_t) };
/** /**
* @brief A 2-byte integer thing type. * @brief A 2-byte integer thing type.
*/ */
static constexpr thing_type ShortType = { thing_type_t::Primitive, sizeof(short_t) }; static constexpr type ShortType = { type_t::Primitive, sizeof(short_t) };
/** /**
* @brief A 4-byte integer thing type. * @brief A 4-byte integer thing type.
*/ */
static constexpr thing_type IntType = { thing_type_t::Primitive, sizeof(int_t) }; static constexpr type IntType = { type_t::Primitive, sizeof(int_t) };
/** /**
* @brief An 8-byte integer thing type. * @brief An 8-byte integer thing type.
*/ */
static constexpr thing_type LongType = { thing_type_t::Primitive, sizeof(long_t) }; static constexpr type LongType = { type_t::Primitive, sizeof(long_t) };
template <template <typename> typename Allocator> template <template <typename> typename Allocator>
class thing final { class thing final {
@@ -64,11 +64,20 @@ public:
* @param type Thing type. * @param type Thing type.
* @param allocator Allocator for the thing's data. * @param allocator Allocator for the thing's data.
*/ */
thing(const thing_type& type, const allocator_type& allocator = {}) thing(const type& type, const allocator_type& allocator = {})
: thing(std::make_shared<class type>(type), allocator) {}
/**
* @brief Constructs a thing.
*
* @param type Thing type.
* @param allocator Allocator for the thing's data.
*/
thing(const type_p& type, const allocator_type& allocator = {})
: m_type(type), m_allocator(allocator) { : m_type(type), m_allocator(allocator) {
switch (type.type) { switch (m_type->type) {
case thing_type_t::Primitive: { case type_t::Primitive: {
m_size = type.value; m_size = m_type->value;
} break; } break;
} }
@@ -88,7 +97,10 @@ public:
* @brief Move constructor. * @brief Move constructor.
*/ */
thing(thing&& other) noexcept thing(thing&& other) noexcept
: m_type(other.m_type), m_data(other.m_data), m_size(other.m_size), m_allocator(std::move(other.m_allocator)) { : m_type(std::move(other.m_type)),
m_data(other.m_data),
m_size(other.m_size),
m_allocator(std::move(other.m_allocator)) {
other.m_type = {}; other.m_type = {};
other.m_data = nullptr; other.m_data = nullptr;
other.m_size = 0; other.m_size = 0;
@@ -118,8 +130,8 @@ public:
*/ */
thing clone() const { thing clone() const {
thing res(m_type, m_allocator); thing res(m_type, m_allocator);
switch (m_type.type) { switch (m_type->type) {
case thing_type_t::Primitive: { case type_t::Primitive: {
std::memcpy(res.m_data, m_data, m_size); std::memcpy(res.m_data, m_data, m_size);
} break; } break;
} }
@@ -131,7 +143,7 @@ public:
* *
* @return The type. * @return The type.
*/ */
constexpr auto type() const { return m_type; } constexpr auto type() const { return *m_type; }
public: public:
/** /**
* @brief Returns a raw data pointer. * @brief Returns a raw data pointer.
@@ -154,7 +166,7 @@ public:
*/ */
template <typename T> template <typename T>
T& get() { T& get() {
if (m_type.type == thing_type_t::Primitive && m_type.value != sizeof(T)) throw bad_thing_access(); if (m_type->type == type_t::Primitive && m_type->value != sizeof(T)) throw bad_thing_access();
return *std::launder(reinterpret_cast<T*>(m_data)); return *std::launder(reinterpret_cast<T*>(m_data));
} }
@@ -165,7 +177,7 @@ public:
*/ */
template <typename T> template <typename T>
const T& get() const { const T& get() const {
if (m_type.type == thing_type_t::Primitive && m_type.value != sizeof(T)) throw bad_thing_access(); if (m_type->type == type_t::Primitive && m_type->value != sizeof(T)) throw bad_thing_access();
return *std::launder(reinterpret_cast<const T*>(m_data)); return *std::launder(reinterpret_cast<const T*>(m_data));
} }
public: public:
@@ -263,8 +275,8 @@ public:
* @return The integer value. * @return The integer value.
*/ */
long_t integer() const { long_t integer() const {
if (m_type.type != thing_type_t::Primitive) throw bad_thing_access(); if (m_type->type != type_t::Primitive) throw bad_thing_access();
switch (m_type.value) { switch (m_type->value) {
case sizeof(byte_t): return get<byte_t>(); case sizeof(byte_t): return get<byte_t>();
case sizeof(short_t): return get<short_t>(); case sizeof(short_t): return get<short_t>();
case sizeof(int_t): return get<int_t>(); case sizeof(int_t): return get<int_t>();
@@ -275,12 +287,12 @@ public:
private: private:
template <typename Op> template <typename Op>
thing binary_op(const thing& rhs, const Op& op) const { thing binary_op(const thing& rhs, const Op& op) const {
if (type().type == thing_type_t::Primitive && rhs.type().type == thing_type_t::Primitive) { if (type().type == type_t::Primitive && rhs.type().type == type_t::Primitive) {
std::size_t size = std::max(type().value, rhs.type().value); std::size_t size = std::max(type().value, rhs.type().value);
long_t result = op(integer(), rhs.integer()); long_t result = op(integer(), rhs.integer());
thing res(thing_type{ thing_type_t::Primitive, size }, m_allocator); thing res({ type_t::Primitive, size }, m_allocator);
switch (size) { switch (size) {
case sizeof(byte_t): res.get<byte_t>() = result; break; case sizeof(byte_t): res.get<byte_t>() = result; break;
case sizeof(short_t): res.get<short_t>() = result; break; case sizeof(short_t): res.get<short_t>() = result; break;
@@ -294,7 +306,7 @@ private:
throw std::runtime_error("unexpected operation"); throw std::runtime_error("unexpected operation");
} }
private: private:
thing_type m_type; type_p m_type;
std::size_t m_size; std::size_t m_size;
std::byte* m_data; std::byte* m_data;