Changeset 33474e6 for tests

Timestamp:

Oct 28, 2024, 11:31:39 AM (15 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master, stuck-waitfor-destruct

Children:

d0296db6

Parents:

720eec9 (diff), bf91d1d (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/concurrency/examples/quickSort.cfa (modified) (3 diffs)

tests/concurrency/examples/quickSort.cfa

@@ -11 +11 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 17 13:59:15 2024
-// Update Count     : 199
+// Last Modified On : Fri Oct 18 16:43:26 2024
+// Update Count     : 200
 //
 
@@ -112 +112 @@
                                 fallthrough;
                           case 3: case 2:
+                                // open input file first as output creates file
                                 if ( strcmp( argv[1], "d" ) != 0 ) {
-                                        try {                                                           // open input file first as output creates file
-                                                open( unsortedfile, argv[1] );
-                                        } catch( open_failure * ) {                     // open failed ?
-                                                serr | "Error! Could not open unsorted input file \"" | argv[1] | "\"";
-                                                throw ExceptionInst( cmd_error );
-                                        } // try
+                                        open( unsortedfile, argv[1] );
                                 } // if
                                 if ( argc > 2 && strcmp( argv[2], "d" ) != 0 ) {
-                                        try {
-                                                open( sortedfile, argv[2] );
-                                        } catch( open_failure * ) {                     // open failed ?
-                                                serr | "Error! Could not open sorted output file \"" | argv[2] | "\"";
-                                                throw ExceptionInst( cmd_error );
-                                        } // try
+                                        open( sortedfile, argv[2] );
                                 } // if
                                 fallthrough;
@@ -134 +125 @@
                         } // choose
                 } // if
+        } catch( open_failure * ) {                     // open failed ?
+                exit | "Error! Could not open unsorted input file \"" | argv[1] | "\"";
+        } catch( open_failure * ) {                     // open failed ?
+                exit | "Error! Could not open sorted output file \"" | argv[2] | "\"";
         } catch( exception_t * ) {                                                      // catch any
                 exit | "Usage: " | argv[0] |                                    // TERMINATE
                         " ( [ unsorted-file | 'd' [ sorted-file | 'd' [ depth (>= 0) ] ] ]"
                         " | -t size (>= 0) [ depth (>= 0) ] )";
-        } //  try
+        } // try
 
         enum { ValuesPerLine = 22 };                                            // number of values printed per line