Changeset 6d8e1ab

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:

a0d6987

Parents:

cac1d52

git-author:

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

git-committer:

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

Message:

Improved EHM code

Added more exceptions, and removed forced exits (end users should handle this)

Location:

libcfa/src

Files:

• parseconfig.cfa (modified) (5 diffs)
• parseconfig.hfa (modified) (1 diff)

libcfa/src/parseconfig.cfa

@@ -9 +9 @@
 
 
+static vtable(Parse_Failure) Parse_Failure_vt;
+
+void ?{}( Parse_Failure & this ) with ( this ) {
+        virtual_table = &Parse_Failure_vt;
+}
+
+static vtable(Unknown_Config_Format) Unknown_Config_Format_vt;
+
+void ?{}( Unknown_Config_Format & this ) with ( this ) {
+        virtual_table = &Unknown_Config_Format_vt;
+}
+
 static vtable(Validation_Failure) Validation_Failure_vt;
 
-void ?{}( Validation_Failure & this, config_entry & entry ) with ( entry ) {
-        this.virtual_table = &Validation_Failure_vt;
-        this.key = key;
-        this.variable = variable;
+void ?{}( Validation_Failure & this ) with ( this ) {
+        virtual_table = &Validation_Failure_vt;
 }
 
@@ -91 +101 @@
         } catch( Open_Failure * ex; ex->istream == &in ) {
                 delete( kv_pairs );
-                exit | "Error: could not open input file '" | config_file | "'";
+                serr | "Error: could not open input file '" | config_file | "'";
+                throw *ex;
                 // HERE (unfreed storage)
         } // try
@@ -106 +117 @@
                         kv_pairs = parse_tabular_config_format( config_file, num_entries );
                 default:
-                        exit | "Error: config file format " | format | " is not supported";
+                        serr | "Error: config file format " | format | " is not supported";
+                        throw (Unknown_Config_Format){};
         }
 
@@ -125 +137 @@
                                         if ( !entries[j].validate( entries[j].variable ) ) {
                                                 delete( kv_pairs );
-                                                throw (Validation_Failure){ entries[j] };
+                                                serr | "Error: config value at key '" | entries[j].key | "' did not pass validation";
+                                                throw (Validation_Failure){};
                                         }
                                 }
@@ -132 +145 @@
                         }
 
-                        serr | "Value '" | src_value | "' for key '" | src_key | "' could not be parsed";
+                        delete( kv_pairs );
+                        serr | "Error: value '" | src_value | "' for key '" | src_key | "' could not be parsed";
+                        throw (Parse_Failure){};
                 }
         }

libcfa/src/parseconfig.hfa

@@ -56 +56 @@
 
 
-exception Validation_Failure {
-        const char * key;
-        void * variable;
-};
+exception Parse_Failure {};
 
-void ?{}( Validation_Failure & this, config_entry & entry );
+void ?{}( Parse_Failure & this );
+
+exception Unknown_Config_Format {};
+
+void ?{}( Unknown_Config_Format & this );
+
+exception Validation_Failure {};
+
+void ?{}( Validation_Failure & this );