kayomn
/
ona
1
0
Fork 0
Code Issues 8 Pull Requests Projects 4 Releases Activity

Tidy up coral::stack

This commit is contained in:
kayomn 2023-02-22 15:31:21 +00:00
parent e2b1550f62
commit d8b9a7e330
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/coral/sequence.cpp
View File

@ -44,16 +44,21 @@ export namespace coral {
* this, it is recommended to use larger `init_capacity` values for data which has a known or * this, it is recommended to use larger `init_capacity` values for data which has a known or
* approximate upper bound at compile-time. Otherwise, the `init_capacity` value may be left at * approximate upper bound at compile-time. Otherwise, the `init_capacity` value may be left at
* its default. * its default.
*
* *Note*: the [allocator] referenced in the stack must remain valid for the duration of the
* stack lifetime.
*/ */
template<typename element, usize init_capacity = 1> struct stack : public sequence<element> { template<typename element, usize init_capacity = 1> struct stack : public sequence<element> {
stack(allocator * dynamic_allocator) : local_buffer{0} { stack(allocator * dynamic_allocator) {
this->dynamic_allocator = dynamic_allocator; this->dynamic_allocator = dynamic_allocator;
this->filled = 0;
this->elements = this->local_buffer;
} }
~stack() override { ~stack() override {
if (this->is_dynamic()) this->dynamic_allocator->deallocate(this->elements.pointer); if (this->is_dynamic()) {
for (element & e : this->elements) e.~element();
this->dynamic_allocator->deallocate(this->elements.pointer);
}
} }
/** /**
@ -115,7 +120,7 @@ export namespace coral {
* Returns `true` if the stack is backed by dynamic memory, otherwise `false`. * Returns `true` if the stack is backed by dynamic memory, otherwise `false`.
*/ */
bool is_dynamic() const { bool is_dynamic() const {
return this->elements.pointer != this->local_buffer; return this->elements.pointer != reinterpret_cast<element const *>(this->local_buffer);
} }
/** /**
@ -157,7 +162,6 @@ export namespace coral {
usize const requested_capacity = this->filled + capacity; usize const requested_capacity = this->filled + capacity;
if (this->is_dynamic()) { if (this->is_dynamic()) {
// Grow dynamic buffer (bailing out if failed).
u8 * const buffer = this->dynamic_allocator->reallocate( u8 * const buffer = this->dynamic_allocator->reallocate(
reinterpret_cast<u8 *>(this->elements.pointer), reinterpret_cast<u8 *>(this->elements.pointer),
sizeof(element) * requested_capacity); sizeof(element) * requested_capacity);
@ -188,13 +192,13 @@ export namespace coral {
} }
private: private:
allocator * dynamic_allocator; allocator * dynamic_allocator{nullptr};
usize filled; usize filled{0};
slice<element> elements; slice<element> elements{reinterpret_cast<element *>(local_buffer), init_capacity};
element local_buffer[init_capacity]; u8 local_buffer[init_capacity]{0};
}; };
/** /**