Changes in src/examples/vector_int.c [1ad1c99:86bd7c1f]

File:

• src/examples/vector_int.c (modified) (3 diffs)

src/examples/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 : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:27:12 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed May 27 18:38:05 2015
 // Update Count     : 3
 //
@@ -22 +22 @@
 #define DEFAULT_CAPACITY 20
 
-void ?{}( vector_int * vec ) {
-        vec { DEFAULT_CAPACITY };
+vector_int vector_int_allocate() {
+        return vector_int_allocate( DEFAULT_CAPACITY );
 }
 
-void ?{}( vector_int * vec, int reserve ) {
-        vec->last = -1;
-        vec->capacity = reserve;
-        vec->data = malloc( sizeof( int ) * reserve );
+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, 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 );
+void vector_int_deallocate( vector_int vec ) {
+        free( vec.data );
 }
 
@@ -63 +56 @@
 // 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;
 }