Changeset 3ac5fd8 for libcfa/src/parseconfig.cfa

Timestamp:

Aug 17, 2024, 3:15:21 PM (7 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

df2e00f

Parents:

afb15cf

Message:

first attempt changing end-of-file to an exception

File:

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

libcfa/src/parseconfig.cfa

@@ -105 +105 @@
 
 static [ bool ] comments( & ifstream in, size_t size, [] char name ) {
-        while () {
-                in | wdi( size, name );
-          if ( eof( in ) ) return true;
-          if ( name[0] != '#' ) return false;
-                in | nl;                                                                                // ignore remainder of line
-        } // while
+        bool comment = false;
+        try {
+                while () {
+                        in | wdi( size, name );
+                        if ( name[0] != '#' ) break;
+                        in | nl;                                                                        // ignore remainder of line
+                } // while
+        } catch( end_of_file * ) {
+                comment = true;
+        } // try
+        return comment;
 } // comments
 
@@ -125 +130 @@
                 [256] char value;
 
-                while () {                                                                              // parameter names can appear in any order
-                        // NOTE: Must add check to see if already read in value for this key,
-                        // once we switch to using hash table as intermediate storage
-                  if ( comments( in, 64, key ) ) break;                 // eof ?
-                        in | wdi( 256, value );
-
-                        add_kv_pair( *kv_pairs, key, value );
-
-                  if ( eof( in ) ) break;
-                        in | nl;                                                                        // ignore remainder of line
-                } // for
+                try {
+                        while () {                                                                              // parameter names can appear in any order
+                                // NOTE: Must add check to see if already read in value for this key,
+                                // once we switch to using hash table as intermediate storage
+                                if ( comments( in, 64, key ) ) break;                   // eof ?
+                                in | wdi( 256, value );
+
+                                add_kv_pair( *kv_pairs, key, value );
+
+                                in | nl;                                                                        // ignore remainder of line
+                        } // while
+                } catch( end_of_file * ) {
+                } // try
         } catch( open_failure * ex; ex->istream == &in ) {
                 delete( kv_pairs );