Changeset 1ad1c99

Timestamp:

Apr 27, 2016, 5:35:59 PM (8 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:

84bb4d9

Parents:

21ae786

Message:

modified vector_test to use constructors and destructors

Location:

src/examples

Files:

• array.c (modified) (3 diffs)
• array.h (modified) (3 diffs)
• vector_int.c (modified) (3 diffs)
• vector_int.h (modified) (3 diffs)
• vector_test.c (modified) (2 diffs)

src/examples/array.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// array.c -- 
+// array.c --
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:13:52 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:21:52 2016
 // Update Count     : 3
 //
@@ -26 +26 @@
 // The first element is always at index 0.
 forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
-elt_type * begin( array_type array ) {
+elt_type * begin( array_type * array ) {
         return &array[ 0 ];
 }
@@ -32 +32 @@
 // The end iterator should point one past the last element.
 forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
-elt_type * end( array_type array ) {
+elt_type * end( array_type * array ) {
         return &array[ last( array ) ] + 1;
 }

src/examples/array.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// array.h -- 
+// array.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:13:35 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:26:04 2016
 // Update Count     : 5
 //
@@ -26 +26 @@
 
 // A bounded array is an array that carries its maximum index with it.
-trait bounded_array( otype array_type, otype elt_type | array( array_type, elt_type ) ) {
-        int last( array_type );
+trait bounded_array( otype array_type, otype elt_type | array( array_type *, elt_type ) ) {
+        int last( array_type * );
 };
 
@@ -41 +41 @@
 // return iterators corresponding to the first element and the one-past-the-end element, STL-style.
 forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
-elt_type *begin( array_type );
+elt_type * begin( array_type * array );
 
+// The end iterator should point one past the last element.
 forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
-elt_type *end( array_type );
+elt_type * end( array_type * array );
 
 #endif // ARRAY_H

src/examples/vector_int.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 17:18:31 2016
+// Last Modified On : Wed Apr 27 17:27:12 2016
 // Update Count     : 3
 //
@@ -30 +30 @@
         vec->capacity = reserve;
         vec->data = malloc( sizeof( int ) * reserve );
+}
+
+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];
+        }
 }
 
@@ -54 +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;
 }
 

src/examples/vector_int.h

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 17:21:59 2016
+// Last Modified On : Wed Apr 27 17:26:59 2016
 // Update Count     : 2
 //
@@ -26 +26 @@
 
 void ?{}( vector_int * );                                                               // allocate vector with default capacity
-void ?{}( vector_int *, int reserve );                                  // allocate vector with specified capacity
+void ?{}( vector_int *, int reserve );          // allocate vector with specified capacity
+void ?{}( vector_int * vec, vector_int other ); // copy constructor
 void ^?{}( vector_int * );                                                              // deallocate vector's storage
 
@@ -34 +35 @@
 // implement bounded_array
 
-lvalue int ?[?]( vector_int vec, int index );                   // access to arbitrary element (does not resize)
-int last( vector_int vec );                                                             // return last element
+lvalue int ?[?]( vector_int * vec, int index );                 // access to arbitrary element (does not resize)
+int last( vector_int * vec );                                                           // return last element
 
 #endif // VECTOR_INT_H

src/examples/vector_test.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 06 17:19:07 2016
+// Last Modified On : Wed Apr 27 17:31:27 2016
 // Update Count     : 18
 //
@@ -34 +34 @@
 
         sout | "Array elements:" | endl;
-        write( begin( vec ), end( vec ), sout );
+        write( begin( &vec ), end( &vec ), sout );
         sout | endl;
 
         sout | "Array elements reversed:" | endl;
-        write_reverse( begin( vec ), end( vec ), sout );
+        write_reverse( begin( &vec ), end( &vec ), sout );
         sout | endl;
 }