Changeset f80e0218 for src/tests/vector/vector_int.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, 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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/tests/vector/vector_int.c (moved) (moved from src/examples/vector_int.c ) (3 diffs)

src/tests/vector/vector_int.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// vector_int.c -- 
+// vector_int.c --
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:38:05 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:27:12 2016
 // Update Count     : 3
 //
@@ -22 +22 @@
 #define DEFAULT_CAPACITY 20
 
-vector_int vector_int_allocate() {
-        return vector_int_allocate( DEFAULT_CAPACITY );
+void ?{}( vector_int * vec ) {
+        vec { DEFAULT_CAPACITY };
 }
 
-vector_int vector_int_allocate( int reserve ) {
-        vector_int new_vector;
-        new_vector.last = -1;
-        new_vector.capacity = reserve;
-        new_vector.data = malloc( sizeof( int ) * reserve );
-        return new_vector;
+void ?{}( vector_int * vec, int reserve ) {
+        vec->last = -1;
+        vec->capacity = reserve;
+        vec->data = malloc( sizeof( int ) * reserve );
 }
 
-void vector_int_deallocate( vector_int vec ) {
-        free( vec.data );
+void ?{}( vector_int * vec, vector_int other ) {
+        vec->last = other.last;
+        vec->capacity = other.capacity;
+        vec->data = malloc( sizeof( int ) * other.capacity );
+        for (int i = 0; i < vec->last; i++) {
+                vec->data[i] = other.data[i];
+        }
+}
+
+void ^?{}( vector_int * vec ) {
+        free( vec->data );
 }
 
@@ -56 +63 @@
 // implement bounded_array
 
-lvalue int ?[?]( vector_int vec, int index ) {
-        return vec.data[ index ];
+lvalue int ?[?]( vector_int * vec, int index ) {
+        return vec->data[ index ];
 }
 
-int last( vector_int vec ) {
-        return vec.last;
+int last( vector_int * vec ) {
+        return vec->last;
 }