Changeset eab39cd

Timestamp:

Apr 6, 2016, 5:22:45 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f326f99

Parents:

a5a71d0

Message:

update vector_test to use constructors and destructors

Location:

src/examples

Files:

• vector_int.c (modified) (2 diffs)
• vector_int.h (modified) (2 diffs)
• vector_test.c (modified) (2 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 : Peter A. Buhr
-// Last Modified On : Wed May 27 18:38:05 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 06 17:18:31 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 ) {
+        free( vec->data );
 }
 

src/examples/vector_int.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// vector_int.h -- 
+// vector_int.h --
 //
 // 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:39:05 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 06 17:21:59 2016
 // Update Count     : 2
 //
@@ -25 +25 @@
 } vector_int;
 
-vector_int vector_int_allocate();                                               // allocate vector with default capacity
-vector_int vector_int_allocate( int reserve );                  // allocate vector with specified capacity
-void vector_int_deallocate( vector_int );                               // deallocate vector's storage
+void ?{}( vector_int * );                                                               // allocate vector with default capacity
+void ?{}( vector_int *, int reserve );                                  // allocate vector with specified capacity
+void ^?{}( vector_int * );                                                              // deallocate vector's storage
 
 void reserve( vector_int *vec, int reserve );                   // reserve more capacity

src/examples/vector_test.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// vector_test.c -- 
+// vector_test.c --
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 12:23:55 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 06 17:19:07 2016
 // Update Count     : 18
 //
@@ -20 +20 @@
 
 int main( void ) {
-        vector_int vec = vector_int_allocate();
+        vector_int vec;
 
         // read in numbers until EOF or error