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

File:

• src/libcfa/containers/vector (modified) (13 diffs)

src/libcfa/containers/vector

@@ -20 +20 @@
 }
 
+#define DESTROY(x)
+
 //------------------------------------------------------------------------------
 //Declaration
 trait allocator_c(otype T, otype allocator_t)
 {
-        void realloc_storage(allocator_t*, size_t);
-        T* data(allocator_t*);
+        void ctor(allocator_t* const);
+        void dtor(allocator_t* const);
+        void realloc_storage(allocator_t* const, size_t);
+        T* data(allocator_t* const);
 };
-
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-struct vector;
-
-//------------------------------------------------------------------------------
-//Initialization
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ?{}(vector(T, allocator_t)* this);
-
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ?{}(vector(T, allocator_t)* this, vector(T, allocator_t) 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);
-
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ^?{}(vector(T, allocator_t)* this);
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
@@ -53 +40 @@
 
 //------------------------------------------------------------------------------
+//Initialization
+forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+void ctor(vector(T, allocator_t) *const this);
+
+forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+void dtor(vector(T, allocator_t) *const this);
+
+//------------------------------------------------------------------------------
 //Capacity
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline bool empty(vector(T, allocator_t)* this)
+static inline bool empty(vector(T, allocator_t) *const this)
 {
         return this->size == 0;
@@ -61 +56 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline size_t size(vector(T, allocator_t)* this)
+static inline size_t size(vector(T, allocator_t) *const this)
 {
         return this->size;
@@ -67 +62 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline void reserve(vector(T, allocator_t)* this, size_t size)
+static inline void reserve(vector(T, allocator_t) *const this, size_t size)
 {
         realloc_storage(&this->storage, this->size+1);
@@ -75 +70 @@
 //Element access
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T at(vector(T, allocator_t)* this, size_t index)
+static inline T at(vector(T, allocator_t) *const this, size_t index)
 {
         return data(&this->storage)[index];
@@ -81 +76 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T ?[?](vector(T, allocator_t)* this, size_t index)
+static inline T ?[?](vector(T, allocator_t) *const this, size_t index)
 {
         return data(&this->storage)[index];
@@ -87 +82 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T front(vector(T, allocator_t)* this)
+static inline T front(vector(T, allocator_t) *const this)
 {
         return data(&this->storage)[0];
@@ -93 +88 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T back(vector(T, allocator_t)* this)
+static inline T back(vector(T, allocator_t) *const this)
 {
         return data(&this->storage)[this->size - 1];
@@ -101 +96 @@
 //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);
 
 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);
 
 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);
 
 //------------------------------------------------------------------------------
 //Iterators
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T* begin(vector(T, allocator_t)* this)
+static inline T* begin(vector(T, allocator_t) *const this)
 {
         return data(&this->storage);
@@ -118 +113 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cbegin(const vector(T, allocator_t)* this)
+static inline const T* cbegin(const vector(T, allocator_t) *const this)
 {
         return data(&this->storage);
@@ -124 +119 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline T* end(vector(T, allocator_t)* this)
+static inline T* end(vector(T, allocator_t) *const this)
 {
         return data(&this->storage) + this->size;
@@ -130 +125 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cend(const vector(T, allocator_t)* this)
+static inline const T* cend(const vector(T, allocator_t) *const this)
 {
         return data(&this->storage) + this->size;
@@ -145 +140 @@
 
 forall(otype T)
-void ?{}(heap_allocator(T)* this);
+void ctor(heap_allocator(T) *const this);
 
 forall(otype T)
-void ?{}(heap_allocator(T)* this, heap_allocator(T) rhs);
+void dtor(heap_allocator(T) *const this);
 
 forall(otype T)
-heap_allocator(T) ?=?(heap_allocator(T)* this, heap_allocator(T) rhs);
+void realloc_storage(heap_allocator(T) *const this, size_t size);
 
 forall(otype T)
-void ^?{}(heap_allocator(T)* this);
-
-forall(otype T)
-void realloc_storage(heap_allocator(T)* this, size_t size);
-
-forall(otype T)
-static inline T* data(heap_allocator(T)* this)
+static inline T* data(heap_allocator(T) *const this)
 {
         return this->storage;