Changes in / [7fe4cc3e:d32c4e2]

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (1 diff)
• libcfa/containers/vector (modified) (1 diff)
• tests/.expect/libcfa_vector.txt (modified) (1 diff)
• tests/libcfa_vector.c (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -449 +449 @@
                                                 FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
                                                 dtorCaller->fixUniqueId();
-                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
+                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor()->clone() );
 
                                                 // on_exit(dtor_atexit);

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/.expect/libcfa_vector.txt

@@ -1 @@
-CFA Version 1.0.0 (debug)
-libcfa_vector.c:3:29: fatal error: containers/vector: No such file or directory
- #include <containers/vector>
-                             ^
-compilation terminated.
-make: *** [libcfa_vector] Error 1
+0
+1
+2
+3
+0

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);
@@ -23 +44 @@
         assert(empty(&iv));
         assert(size(&iv) == 0);
+        printf("%d\n", size(&iv));
 
         return 0;