Changeset d322f62

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:

f62e741

Parents:

57dff2f

git-author:

Jacob Prud'homme <jafprudhomme@…> (08/06/21 00:56:45)

git-committer:

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

Message:

Used more modern built-in EHM

Location:

libcfa/src

Files:

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

libcfa/src/parseconfig.cfa

@@ -9 +9 @@
 
 
-EHM_VIRTUAL_TABLE(Validation_Failure, Validation_Failure_main_table);
+static vtable(Validation_Failure) Validation_Failure_vt;
+
 void ?{}( Validation_Failure & this, config_entry & entry ) with ( entry ) {
-        this.virtual_table = &Validation_Failure_main_table;
+        this.virtual_table = &Validation_Failure_vt;
         this.key = key;
         this.variable = variable;
-}
-void throwValidation_Failure( config_entry & entry ) {
-        Validation_Failure exc = { entry };
 }
 
@@ -122 +120 @@
                                 // Validate the parsed data, if necessary
                                 if ( entries[j].validate != (bool (*)(void *))0p ) {
-                                        if ( !entries[j].validate( entries[j].variable ) ) throwValidation_Failure( entries[j] );
+                                        if ( !entries[j].validate( entries[j].variable ) ) throw (Validation_Failure){ entries[j] }; // HERE (segfaults on throw)
                                 }
 

libcfa/src/parseconfig.hfa

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