Changeset 8d61d620 for tests/concurrent/examples/quickSort.generic.cfa

Timestamp:

Jun 21, 2019, 3:42:05 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

18e683b, f2f22e3

Parents:

c1ed2ee (diff), 49dee5e (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

File:

• tests/concurrent/examples/quickSort.generic.cfa (modified) (5 diffs)

tests/concurrent/examples/quickSort.generic.cfa

@@ -11 +11 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 15 14:52:41 2019
-// Update Count     : 147
+// Last Modified On : Fri Jun 21 08:28:20 2019
+// Update Count     : 149
 //
 
@@ -141 +141 @@
                   if ( eof( unsortedfile ) ) break;
                         ELEMTYPE * values = alloc( size );                      // values to be sorted, too large to put on stack
-                        for ( int counter = 0; counter < size; counter += 1 ) { // read unsorted numbers
+                        for ( counter; size ) {                                         // read unsorted numbers
                                 unsortedfile | values[counter];
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
@@ -151 +151 @@
                                 Quicksort(ELEMTYPE) QS = { values, size - 1, 0 }; // sort values
                         } // wait until sort tasks terminate
-                        for ( int counter = 0; counter < size; counter += 1 ) { // print sorted list
+                        for ( counter; size ) {                                         // print sorted list
                                 if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
                                 sortedfile | values[counter];
@@ -166 +166 @@
 
                 ELEMTYPE * values = alloc( size );                              // values to be sorted, too large to put on stack
-                for ( int counter = 0; counter < size; counter += 1 ) { // generate unsorted numbers
+                for ( counter; size ) {                                                 // generate unsorted numbers
                         values[counter] = size - counter;                       // descending values
                 } // for
@@ -173 +173 @@
                 } // wait until sort tasks terminate
 
-                // for ( int counter = 0; counter < size - 1; counter += 1 ) { // check sorting
+                // for ( counter; size - 1 ) {                                  // check sorting
                 //      if ( values[counter] > values[counter + 1] ) abort();
                 // } // for