Changes in src/libcfa/containers/vector.c [bd34fc87:60aa49a7]

File:

• src/libcfa/containers/vector.c (modified) (6 diffs)

src/libcfa/containers/vector.c

@@ -18 +18 @@
 #include <stdlib>
 
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void copy_internal(vector(T, allocator_t)* this, vector(T, allocator_t)* other);
-
 //------------------------------------------------------------------------------
 //Initialization
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ?{}(vector(T, allocator_t)* this)
+void ctor(vector(T, allocator_t) *const this)
 {
-        (&this->storage){};
+        ctor(&this->storage);
         this->size = 0;
 }
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ?{}(vector(T, allocator_t)* this, vector(T, allocator_t) rhs)
-{
-        (&this->storage){ rhs.storage };
-        copy_internal(this, &rhs);
-}
-
-// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-// vector(T, allocator_t) ?=?(vector(T, allocator_t)* this, vector(T, allocator_t) rhs)
-// {
-//      (&this->storage){};
-//      copy_internal(this, &rhs);
-//      return *this;
-// }
-
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ^?{}(vector(T, allocator_t)* this)
+void dtor(vector(T, allocator_t) *const this)
 {
         clear(this);
-        ^(&this->storage){};
+        dtor(&this->storage);
 }
 
@@ -55 +37 @@
 //Modifiers
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void push_back(vector(T, allocator_t)* this, T value)
+void push_back(vector(T, allocator_t) *const this, T value)
 {
         realloc_storage(&this->storage, this->size+1);
@@ -63 +45 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void pop_back(vector(T, allocator_t)* this)
+void pop_back(vector(T, allocator_t) *const this)
 {
         this->size--;
-        ^(&data(&this->storage)[this->size]){};
+        DESTROY(data(&this->storage)[this->size]);
 }
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void clear(vector(T, allocator_t)* this)
+void clear(vector(T, allocator_t) *const this)
 {
         for(size_t i = 0; i < this->size; i++)
         {
-                ^(&data(&this->storage)[this->size]){};
+                DESTROY(data(&this->storage)[this->size]);
         }
         this->size = 0;
@@ -80 +62 @@
 
 //------------------------------------------------------------------------------
-//Internal Helpers
-
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void copy_internal(vector(T, allocator_t)* this, vector(T, allocator_t)* other)
-{
-        this->size = other->size;
-        for(size_t i = 0; i < this->size; i++) {
-                (&data(&this->storage)[this->size]){ data(&other->storage)[other->size] };
-        }
-}
-
-//------------------------------------------------------------------------------
 //Allocator
 forall(otype T)
-void ?{}(heap_allocator(T)* this)
+void ctor(heap_allocator(T) *const this)
 {
         this->storage = 0;
@@ -101 +71 @@
 
 forall(otype T)
-void ?{}(heap_allocator(T)* this, heap_allocator(T) rhs)
-{
-        this->capacity = rhs.capacity;
-        this->storage = (T*)realloc((void*)this->storage, this->capacity * sizeof(T));
-}
-
-forall(otype T)
-heap_allocator(T) ?=?(heap_allocator(T)* this, heap_allocator(T) rhs)
-{
-        this->capacity = rhs.capacity;
-        this->storage = (T*)realloc((void*)this->storage, this->capacity * sizeof(T));
-        return *this;
-}
-
-forall(otype T)
-void ^?{}(heap_allocator(T)* this)
+void dtor(heap_allocator(T) *const this)
 {
         free(this->storage);
@@ -122 +77 @@
 
 forall(otype T)
-inline void realloc_storage(heap_allocator(T)* this, size_t size)
+inline void realloc_storage(heap_allocator(T) *const this, size_t size)
 {
         enum { GROWTH_RATE = 2 };