Changeset 6b224a52 for src/tests/vector

Timestamp:

Aug 25, 2017, 12:11:53 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

bf7b9da7

Parents:

135b431 (diff), f676b84 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/tests/vector

Files:

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

src/tests/vector/array.h

@@ -21 +21 @@
 // element has index 0.
 trait array( otype array_type, otype elt_type ) {
-        lvalue elt_type ?[?]( array_type, int );
+        elt_type & ?[?]( array_type, int );
 };
 

src/tests/vector/vector_int.c

@@ -20 +20 @@
 #define DEFAULT_CAPACITY 20
 
-void ?{}( vector_int * vec ) {
+void ?{}( vector_int & vec ) {
         vec { DEFAULT_CAPACITY };
 }
 
-void ?{}( vector_int * vec, int reserve ) {
-        vec->last = -1;
-        vec->capacity = reserve;
-        vec->data = malloc( sizeof( int ) * reserve );
+void ?{}( vector_int & vec, int reserve ) {
+        vec.last = -1;
+        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];
+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 & vec ) {
+        free( vec.data );
 }
 
@@ -61 +61 @@
 // implement bounded_array
 
-lvalue int ?[?]( vector_int * vec, int index ) {
+int & ?[?]( vector_int * vec, int index ) {
         return vec->data[ index ];
 }

src/tests/vector/vector_int.h

@@ -24 +24 @@
 } vector_int;
 
-void ?{}( vector_int * );                                                               // allocate vector with default 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
+void ?{}( vector_int & );                                                               // allocate vector with default 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
 
 void reserve( vector_int *vec, int reserve );                   // reserve more capacity
@@ -34 +34 @@
 // 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
+int & ?[?]( vector_int * vec, int index );                              // access to arbitrary element (does not resize)
+int last( vector_int * vec );             // return last element
 
 // Local Variables: //

src/tests/vector/vector_test.c

@@ -9 +9 @@
 // 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:31:27 2016
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 24 08:15:38 2017
+// Update Count     : 19
 //
 
@@ -27 +27 @@
         sout | "enter N elements and C-d on a separate line:" | endl;
         for ( ;; ) {
-                sin | #
+                sin | num;
           if ( fail( sin ) || eof( sin ) ) break;
                 append( &vec, num );