Changeset ed3f3bf4

Timestamp:

Jul 4, 2016, 1:09:01 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3f97e68, 888ee76

Parents:

f48ed47

Message:

fixed some of the obvious mistakes in generic vector

Location:

src

Files:

• libcfa/containers/vector (modified) (1 diff)
• tests/libcfa_vector.c (modified) (1 diff)

src/libcfa/containers/vector

@@ -40 +40 @@
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline bool size(vector(T, allocator_t) *const this)
+static inline size_t size(vector(T, allocator_t) *const this)
 {
         return this->size;

src/tests/libcfa_vector.c

@@ -1 +1 @@
 #include <stdlib>
+
+extern "C" {
+        #include <stdio.h>
+}
 
 #include <containers/vector>
 
+#define assert(x) do {\
+        if(!(x)) {\
+                printf("CHECK failed : %s at %s:%i\n", #x, __FILE__, __LINE__);\
+                abort();\
+        }}while(0 == 1)\
+
 int main(int argc, char const *argv[]) {
-        vector(int) iv;
+        vector(int, heap_allocator(int)) iv;
+        ctor(&iv);
+
+        assert(empty(&iv));
+        assert(size(&iv) == 0);
+        printf("%d\n", size(&iv));
 
         push_back(&iv, 1);
+        printf("%d\n", size(&iv));
+        assert(size(&iv) == 1);
         push_back(&iv, 2);
+        printf("%d\n", size(&iv));
+        assert(size(&iv) == 2);
         push_back(&iv, 3);
+        printf("%d\n", size(&iv));
+        assert(size(&iv) == 3);
 
         assert(!empty(&iv));
         assert(size(&iv) == 3);
-        assert(iv[0] == 1);
         assert(at(&iv, 0) == 1);
-        assert(iv[1] == 2);
+        assert((&iv)[0] == 1);
         assert(at(&iv, 1) == 2);
-        assert(iv[2] == 3);
+        assert((&iv)[1] == 2);
         assert(at(&iv, 2) == 3);
+        assert((&iv)[2] == 3);
 
         clear(&iv);