Changeset aca65621 for src/libcfa/containers/vector.c

Timestamp:

Jul 12, 2017, 4:40:02 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0698aa1

Parents:

469f709

Message:

Convert several library files to use references

File:

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

src/libcfa/containers/vector.c

@@ -24 +24 @@
 //Initialization
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ?{}(vector(T, allocator_t)* this)
+void ?{}(vector(T, allocator_t)& this)
 {
-        (&this->storage){};
-        this->size = 0;
+        (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)
+void ?{}(vector(T, allocator_t)& this, vector(T, allocator_t) rhs)
 {
-        (&this->storage){ rhs.storage };
-        copy_internal(this, &rhs);
+        (this.storage){ rhs.storage };
+        copy_internal(&this, &rhs);
 }
 
@@ -46 +46 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-void ^?{}(vector(T, allocator_t)* this)
+void ^?{}(vector(T, allocator_t)& this)
 {
-        clear(this);
-        ^(&this->storage){};
+        clear(&this);
+        ^(this.storage){};
 }
 
@@ -66 +66 @@
 {
         this->size--;
-        ^(&data(&this->storage)[this->size]){};
+        ^(data(&this->storage)[this->size]){};
 }
 
@@ -74 +74 @@
         for(size_t i = 0; i < this->size; i++)
         {
-                ^(&data(&this->storage)[this->size]){};
+                ^(data(&this->storage)[this->size]){};
         }
         this->size = 0;
@@ -87 +87 @@
         this->size = other->size;
         for(size_t i = 0; i < this->size; i++) {
-                (&data(&this->storage)[this->size]){ data(&other->storage)[other->size] };
+                (data(&this->storage)[this->size]){ data(&other->storage)[other->size] };
         }
 }
@@ -94 +94 @@
 //Allocator
 forall(otype T)
-void ?{}(heap_allocator(T)* this)
+void ?{}(heap_allocator(T)& this)
 {
-        this->storage = 0;
-        this->capacity = 0;
+        this.storage = 0;
+        this.capacity = 0;
 }
 
 forall(otype T)
-void ?{}(heap_allocator(T)* this, heap_allocator(T) rhs)
+void ?{}(heap_allocator(T)& this, heap_allocator(T) rhs)
 {
-        this->capacity = rhs.capacity;
-        this->storage = (T*)realloc((void*)this->storage, this->capacity * sizeof(T));
+        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)
+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;
+        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 ^?{}(heap_allocator(T)& this)
 {
-        free(this->storage);
+        free(this.storage);
 }