Changeset d0c91a6 for tests/concurrent/examples/quickSort.cfa

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (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' into jenkins-sandbox

File:

• tests/concurrent/examples/quickSort.cfa (moved) (moved from tests/concurrent/examples/quickSort.c ) (6 diffs)

tests/concurrent/examples/quickSort.cfa

@@ -9 +9 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 16 08:17:41 2018
-// Update Count     : 163
+// Last Modified On : Sat Dec 22 08:44:27 2018
+// Update Count     : 168
 //
 
@@ -88 +88 @@
 
 void usage( char * argv[] ) {
-        sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )" | endl;
+        sout | "Usage:" | argv[0] | "( -s unsorted-file [ sorted-file ] | -t size (>= 0) [ depth (>= 0) ] )";
         exit( EXIT_FAILURE );                                                           // TERMINATE!
 } // usage
@@ -114 +114 @@
                                 &sortedfile = new( (const char *)argv[2] ); // open the output file
                                 if ( fail( sortedfile ) ) {
-                                        serr | "Error! Could not open sorted output file \"" | argv[2] | "\"" | endl;
+                                        serr | "Error! Could not open sorted output file \"" | argv[2] | "\"";
                                         usage( argv );
                                 } // if
@@ -121 +121 @@
                                 &unsortedfile = new( (const char *)argv[1] ); // open the input file
                                 if ( fail( unsortedfile ) ) {
-                                        serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"" | endl;
+                                        serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"";
                                         usage( argv );
                                 } // if
@@ -127 +127 @@
                 } // if
         } // if
+        sortedfile | nlOff;                                                                     // turn off auto newline
 
         enum { ValuesPerLine = 22 };                                            // number of values printed per line
@@ -137 +138 @@
                         for ( int counter = 0; counter < size; counter += 1 ) { // read unsorted numbers
                                 unsortedfile | values[counter];
-                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
-                        sortedfile | endl;
+                        sortedfile | nl;
                         if ( size > 0 ) {                                                       // values to sort ?
                                 Quicksort QS = { values, size - 1, 0 }; // sort values
                         } // wait until sort tasks terminate
                         for ( int counter = 0; counter < size; counter += 1 ) { // print sorted list
-                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | endl | "  ";
+                                if ( counter != 0 && counter % ValuesPerLine == 0 ) sortedfile | nl | "  ";
                                 sortedfile | values[counter];
                                 if ( counter < size - 1 && (counter + 1) % ValuesPerLine != 0 ) sortedfile | ' ';
                         } // for
-                        sortedfile | endl | endl;
+                        sortedfile | nl | nl;
 
                         delete( values );