Changeset c3c76cd for libcfa/src

Timestamp:

Aug 31, 2021, 1:49:09 AM (3 years ago)

Author:

Jacob Prud'homme <jafprudhomme@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

dac3455

Parents:

1896c1f

git-author:

Jacob Prud'homme <jafprudhomme@…> (06/15/21 11:22:16)

git-committer:

Jacob Prud'homme <jafprudhomme@…> (08/31/21 01:49:09)

Message:

Coalesced all file closes to one location

File:

• libcfa/src/parseconfig.cfa (modified) (2 diffs)

libcfa/src/parseconfig.cfa

@@ -50 +50 @@
                         in | value;
                         if ( value < 0 ) {
-                                close( in );
                                 exit | "Error: file \"" | configFile | "\" parameter " | name
                                          | " value " | value | " must be non-negative."; // *** DOES THIS PRINT TO STDERR??? IT MUST!!! *** //
@@ -62 +61 @@
 
                 if ( numOfParm != Parmnum ) {
-                        close( in );
                         exit | "Error: file \"" | configFile | "\" is corrupt."; // *** DOES THIS PRINT TO STDERR??? IT MUST!!! *** //
                 } // if
                 if ( ! comments( in, name ) ) {                                 // ! eof ?
-                        close( in );
                         exit | "Error: file \"" | configFile | "\" has extraneous data."; // *** DOES THIS PRINT TO STDERR??? IT MUST!!! *** //
                 } // if
         } catch( Open_Failure * ex; ex->istream == &in ) {
+                exit | "Error: could not open input file \"" | configFile | "\""; // *** DOES THIS PRINT TO STDERR??? IT MUST!!! *** //
+        } finally {
                 close( in );
-                exit | "Error: could not open input file \"" | configFile | "\""; // *** DOES THIS PRINT TO STDERR??? IT MUST!!! *** //
         } // try
-
-        close( in );
 
         if ( cparms.numStops < 2 ) {