Changeset a0d6987

Timestamp:

Aug 31, 2021, 1:49:10 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:

5993b6a

Parents:

6d8e1ab

git-author:

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

git-committer:

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

Message:

Cleaned up and un-nested code

File:

• libcfa/src/parseconfig.cfa (modified) (1 diff)

libcfa/src/parseconfig.cfa

@@ -130 +130 @@
                 for ( j; num_entries ) {
                   if ( strcmp( src_key, entries[j].key ) != 0 ) continue;
-                        if ( entries[j].parse( src_value, entries[j].variable ) ) {
-                                ++entries_so_far;
-
-                                // Validate the parsed data, if necessary
-                                if ( entries[j].validate != (bool (*)(void *))0p ) {
-                                        if ( !entries[j].validate( entries[j].variable ) ) {
-                                                delete( kv_pairs );
-                                                serr | "Error: config value at key '" | entries[j].key | "' did not pass validation";
-                                                throw (Validation_Failure){};
-                                        }
-                                }
-
-                                break;
+                        if ( !entries[j].parse( src_value, entries[j].variable ) ) {
+                                delete( kv_pairs );
+                                serr | "Error: value '" | src_value | "' for key '" | src_key | "' could not be parsed";
+                                throw (Parse_Failure){};
                         }
 
-                        delete( kv_pairs );
-                        serr | "Error: value '" | src_value | "' for key '" | src_key | "' could not be parsed";
-                        throw (Parse_Failure){};
+                        // Validate the parsed data, if necessary
+                        if ( entries[j].validate != (bool (*)(void *))0p
+                                        && !entries[j].validate( entries[j].variable ) ) {
+                                delete( kv_pairs );
+                                serr | "Error: config value at key '" | entries[j].key | "' did not pass validation";
+                                throw (Validation_Failure){};
+                        }
+
+                        ++entries_so_far;
+
+                        break;
                 }
         }