Compare commits

..

No commits in common. "f5de9c5589b7ce8556dd9424961529613a497336" and "2bc6398d3edbe820dd26b1bc1c8360822cee794a" have entirely different histories.

2 changed files with 4 additions and 24 deletions

View File

@ -113,7 +113,7 @@ static Option<HeapBlock*> split(HeapBlock* block, usize size)
new_block->magic = BLOCK_MAGIC;
new_block->status = (block->status & BLOCK_END_MEM) ? BLOCK_END_MEM : 0;
new_block->full_size = old_size - (offset + sizeof(HeapBlock));
heap.add_after(block, new_block);
heap.append_after(block, new_block);
block->status &= ~BLOCK_END_MEM; // this block is no longer the last block in its memory range

View File

@ -45,18 +45,12 @@ template <typename T> class DoublyLinkedListNode
m_last_node->m_next_node = m_next_node;
}
void append_to_list(SelfType* end_node)
void add_to_list(SelfType* end_node)
{
end_node->m_next_node = this;
this->m_last_node = end_node;
}
void prepend_to_list(SelfType* start_node)
{
start_node->m_last_node = this;
this->m_next_node = start_node;
}
friend class DoublyLinkedList<T>;
};
@ -71,7 +65,7 @@ template <typename T> class DoublyLinkedList
{
Node* const node = extract_node(ptr);
if (!m_start_node) m_start_node = node;
if (m_end_node) node->append_to_list(m_end_node);
if (m_end_node) node->add_to_list(m_end_node);
else
{
node->set_next(nullptr);
@ -82,21 +76,7 @@ template <typename T> class DoublyLinkedList
m_count++;
}
void prepend(T* ptr)
{
Node* const node = extract_node(ptr);
if (m_start_node) node->prepend_to_list(m_start_node);
else
{
node->set_next(nullptr);
node->set_last(nullptr);
}
m_start_node = node;
m_count++;
}
void add_after(T* base, T* ptr)
void append_after(T* base, T* ptr)
{
Node* const new_node = extract_node(ptr);
Node* const base_node = extract_node(base);