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

refactor: rename list to array

Browse Source 
Closes: #42
This commit is contained in:
Aleksander Krajewski
2026-07-05 22:41:53 +02:00
parent ee9eadeea8
commit b913fc0c8b
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
furvm/include/furvm/thing.hpp
+11 -11
View File
@@ -100,8 +100,8 @@ public:
case type_t::Reference: { case type_t::Reference: {
std::memcpy(res.m_data, m_data, m_size); std::memcpy(res.m_data, m_data, m_size);
} break; } break;
case type_t::List: { case type_t::Array: {
copy_list(resolve_type(*m_type->list, m_modules), res.get<list_t>(), get<list_t>()); copy_list(resolve_type(*m_type->list, m_modules), res.get<array_t>(), get<array_t>());
} break; } break;
case type_t::Import: throw std::runtime_error("unreachable"); case type_t::Import: throw std::runtime_error("unreachable");
} }
@@ -278,8 +278,8 @@ public:
} }
void resize(long_t newSize) { void resize(long_t newSize) {
if (m_type->t != type_t::List) throw bad_thing_access(); if (m_type->t != type_t::Array) throw bad_thing_access();
auto& list = get<list_t>(); auto& list = get<array_t>();
if (newSize < 0 || newSize == list.size) return; if (newSize < 0 || newSize == list.size) return;
std::byte* newData = new std::byte[compute_size_na(resolve_type(*m_type->list, m_modules)) * newSize]; std::byte* newData = new std::byte[compute_size_na(resolve_type(*m_type->list, m_modules)) * newSize];
std::memcpy(newData, std::memcpy(newData,
@@ -291,8 +291,8 @@ public:
} }
thing at(long_t index) const { thing at(long_t index) const {
if (m_type->t != type_t::List) throw bad_thing_access(); if (m_type->t != type_t::Array) throw bad_thing_access();
auto& list = get<list_t>(); auto& list = get<array_t>();
if (index < 0 || index >= list.size) throw std::out_of_range("index out of range"); if (index < 0 || index >= list.size) throw std::out_of_range("index out of range");
thing res = { *m_type->list, m_modules, m_allocator }; thing res = { *m_type->list, m_modules, m_allocator };
res.get<reference_t>() = list.data; // TODO: Account for padding, alignment and stuff res.get<reference_t>() = list.data; // TODO: Account for padding, alignment and stuff
@@ -306,7 +306,7 @@ public:
return rsv; return rsv;
} }
private: private:
static void copy_list(const type_p& innerType, list_t& dst, const list_t& src) { static void copy_list(const type_p& innerType, array_t& dst, const array_t& src) {
dst.size = src.size; dst.size = src.size;
if (dst.size <= 0) { if (dst.size <= 0) {
dst.data = nullptr; dst.data = nullptr;
@@ -319,11 +319,11 @@ private:
switch (innerType->t) { switch (innerType->t) {
case type_t::Primitive: case type_t::Primitive:
case type_t::Reference: std::memcpy(dst.data, src.data, size); break; case type_t::Reference: std::memcpy(dst.data, src.data, size); break;
case type_t::List: case type_t::Array:
for (std::size_t i = 0; i < size; ++i) { for (std::size_t i = 0; i < size; ++i) {
copy_list(*innerType->list, copy_list(*innerType->list,
*std::launder(reinterpret_cast<list_t*>(dst.data)), *std::launder(reinterpret_cast<array_t*>(dst.data)),
*std::launder(reinterpret_cast<list_t*>(src.data))); *std::launder(reinterpret_cast<array_t*>(src.data)));
} }
break; break;
case type_t::Import: throw std::runtime_error("unresolved type"); case type_t::Import: throw std::runtime_error("unresolved type");
@@ -334,7 +334,7 @@ private:
switch (type->t) { switch (type->t) {
case type_t::Primitive: return type->primitive; case type_t::Primitive: return type->primitive;
case type_t::Reference: return sizeof(reference_t); case type_t::Reference: return sizeof(reference_t);
case type_t::List: return sizeof(list_t); case type_t::Array: return sizeof(array_t);
case type_t::Import: throw std::runtime_error("unresolved type"); case type_t::Import: throw std::runtime_error("unresolved type");
} }
furvm/include/furvm/type.hpp
+11 -11
View File
@@ -10,14 +10,14 @@ namespace furvm {
enum class type_t : std::uint32_t { enum class type_t : std::uint32_t {
Primitive = 0, Primitive = 0,
Reference, Reference,
List, Array,
Import, Import,
}; };
using primitive_type = std::uint64_t; using primitive_type = std::uint64_t;
using reference_type = type_p; using reference_type = type_p;
using list_type = type_h; using array_type = type_h;
struct import_type { struct import_type {
mod_id mod; mod_id mod;
@@ -29,7 +29,7 @@ struct type {
union { union {
primitive_type primitive; primitive_type primitive;
reference_type reference; reference_type reference;
list_type list; array_type list;
import_type imp; import_type imp;
}; };
@@ -42,8 +42,8 @@ struct type {
type(const reference_type& reference) type(const reference_type& reference)
: t(type_t::Reference), reference(reference) {} : t(type_t::Reference), reference(reference) {}
type(const list_type& list) type(const array_type& list)
: t(type_t::List), list(list) {} : t(type_t::Array), list(list) {}
type(const import_type& imp) type(const import_type& imp)
: t(type_t::Import), imp(imp) {} : t(type_t::Import), imp(imp) {}
@@ -51,7 +51,7 @@ struct type {
~type() { ~type() {
switch (t) { switch (t) {
case type_t::Reference: reference.~reference_type(); break; case type_t::Reference: reference.~reference_type(); break;
case type_t::List: list.~list_type(); break; case type_t::Array: list.~array_type(); break;
case type_t::Import: imp.~import_type(); break; case type_t::Import: imp.~import_type(); break;
default: break; default: break;
} }
@@ -62,7 +62,7 @@ struct type {
switch (t) { switch (t) {
case type_t::Primitive: primitive = other.primitive; break; case type_t::Primitive: primitive = other.primitive; break;
case type_t::Reference: reference = std::move(other.reference); break; case type_t::Reference: reference = std::move(other.reference); break;
case type_t::List: list = std::move(other.list); break; case type_t::Array: list = std::move(other.list); break;
case type_t::Import: imp = std::move(other.imp); break; case type_t::Import: imp = std::move(other.imp); break;
} }
} }
@@ -73,7 +73,7 @@ struct type {
switch (t) { switch (t) {
case type_t::Primitive: primitive = other.primitive; break; case type_t::Primitive: primitive = other.primitive; break;
case type_t::Reference: reference = std::move(other.reference); break; case type_t::Reference: reference = std::move(other.reference); break;
case type_t::List: list = std::move(other.list); break; case type_t::Array: list = std::move(other.list); break;
case type_t::Import: imp = std::move(other.imp); break; case type_t::Import: imp = std::move(other.imp); break;
} }
@@ -85,7 +85,7 @@ struct type {
switch (t) { switch (t) {
case type_t::Primitive: primitive = other.primitive; break; case type_t::Primitive: primitive = other.primitive; break;
case type_t::Reference: reference = other.reference; break; case type_t::Reference: reference = other.reference; break;
case type_t::List: list = other.list; break; case type_t::Array: list = other.list; break;
case type_t::Import: imp = other.imp; break; case type_t::Import: imp = other.imp; break;
} }
} }
@@ -96,7 +96,7 @@ struct type {
switch (t) { switch (t) {
case type_t::Primitive: primitive = other.primitive; break; case type_t::Primitive: primitive = other.primitive; break;
case type_t::Reference: reference = other.reference; break; case type_t::Reference: reference = other.reference; break;
case type_t::List: list = other.list; break; case type_t::Array: list = other.list; break;
case type_t::Import: imp = other.imp; break; case type_t::Import: imp = other.imp; break;
} }
@@ -111,7 +111,7 @@ using long_t = std::int64_t; /**< An 8-byte integer. */
using reference_t = std::byte*; using reference_t = std::byte*;
struct list_t { struct array_t {
long_t size; long_t size;
std::byte* data; std::byte* data;
}; };
furvm/src/executor.cpp
+3 -3
View File
@@ -167,8 +167,8 @@ void executor::step() {
auto ptr = push_thing({ *m_context->at("core")->type_at(4), m_context, m_context->thing_alloc() }); auto ptr = push_thing({ *m_context->at("core")->type_at(4), m_context, m_context->thing_alloc() });
switch (furvm::thing<>::resolve_type(thing.type(), m_context)->t) { switch (furvm::thing<>::resolve_type(thing.type(), m_context)->t) {
case type_t::Primitive: ptr->get<std::uintptr_t>() = reinterpret_cast<std::uintptr_t>(thing.raw()); break; case type_t::Primitive: ptr->get<std::uintptr_t>() = reinterpret_cast<std::uintptr_t>(thing.raw()); break;
case type_t::List: case type_t::Array:
ptr->get<std::uintptr_t>() = reinterpret_cast<std::uintptr_t>(thing.get<list_t>().data); ptr->get<std::uintptr_t>() = reinterpret_cast<std::uintptr_t>(thing.get<array_t>().data);
break; break;
case type_t::Reference: case type_t::Reference:
case type_t::Import: case type_t::Import:
@@ -181,7 +181,7 @@ void executor::step() {
auto type = furvm::thing<>::resolve_type(thing.type(), m_context); auto type = furvm::thing<>::resolve_type(thing.type(), m_context);
switch (type->t) { switch (type->t) {
case type_t::Primitive: ptr->get<long_t>() = static_cast<long_t>(type->primitive); break; case type_t::Primitive: ptr->get<long_t>() = static_cast<long_t>(type->primitive); break;
case type_t::List: ptr->get<long_t>() = thing.get<list_t>().size; break; case type_t::Array: ptr->get<long_t>() = thing.get<array_t>().size; break;
case type_t::Reference: case type_t::Reference:
case type_t::Import: case type_t::Import:
default: throw std::runtime_error("unreachable"); default: throw std::runtime_error("unreachable");
furvm/src/module.cpp
+2 -2
View File
@@ -58,7 +58,7 @@ std::ostream& mod::serialize(std::ostream& os) const {
switch (type->t) { switch (type->t) {
case type_t::Primitive: detail::serialize(os, type->primitive); break; case type_t::Primitive: detail::serialize(os, type->primitive); break;
case type_t::Reference: throw std::runtime_error("reference type serialization is unimplemented"); case type_t::Reference: throw std::runtime_error("reference type serialization is unimplemented");
case type_t::List: detail::serialize(os, type->list.id()); break; case type_t::Array: detail::serialize(os, type->list.id()); break;
case type_t::Import: { case type_t::Import: {
detail::serialize(os, type->imp.mod); detail::serialize(os, type->imp.mod);
detail::serialize(os, type->imp.type); detail::serialize(os, type->imp.type);
@@ -127,7 +127,7 @@ mod mod::load(std::istream& is) {
mod.emplace_type(id, std::make_shared<class type>(primitive)).dispatch(); mod.emplace_type(id, std::make_shared<class type>(primitive)).dispatch();
} break; } break;
case type_t::Reference: throw std::runtime_error("reference type serialization is unimplemented"); case type_t::Reference: throw std::runtime_error("reference type serialization is unimplemented");
case type_t::List: { case type_t::Array: {
type_id typeId = 0; type_id typeId = 0;
detail::load(is, typeId); detail::load(is, typeId);
mod.emplace_type(id, std::make_shared<class type>(mod.type_at(typeId))).dispatch(); mod.emplace_type(id, std::make_shared<class type>(mod.type_at(typeId))).dispatch();