Changeset dcf792a

Timestamp:

Aug 31, 2021, 11:35:29 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:

a75cd3d

Parents:

3be4078

Message:

Added more information to exceptions

Location:

libcfa/src

Files:

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

libcfa/src/parseconfig.cfa

@@ -11 +11 @@
 static vtable(Missing_Config_Entries) Missing_Config_Entries_vt;
 
-void ?{}( Missing_Config_Entries & this, unsigned int num_missing ) with ( this ) {
-        virtual_table = &Missing_Config_Entries_vt;
-        missing = num_missing;
-}
+void ?{}( Missing_Config_Entries & this, unsigned int num_missing ) {
+        this.virtual_table = &Missing_Config_Entries_vt;
+        this.num_missing = num_missing;
+}
+
 
 static vtable(Parse_Failure) Parse_Failure_vt;
 
-void ?{}( Parse_Failure & this ) with ( this ) {
-        virtual_table = &Parse_Failure_vt;
-}
+void ?{}( Parse_Failure & this, char * failed_key, char * failed_value ) {
+        this.virtual_table = &Parse_Failure_vt;
+
+        this.failed_key = alloc( strlen( failed_key ) );
+        this.failed_value = alloc( strlen( failed_value ) );
+        strcpy( this.failed_key, failed_key );
+        strcpy( this.failed_value, failed_value );
+}
+
+void ^?{}( Parse_Failure & this ) with ( this ) {
+        free( failed_key );
+        free( failed_value );
+}
+
 
 static vtable(Validation_Failure) Validation_Failure_vt;
 
-void ?{}( Validation_Failure & this ) with ( this ) {
-        virtual_table = &Validation_Failure_vt;
+void ?{}( Validation_Failure & this, char * failed_key, char * failed_value ) {
+        this.virtual_table = &Validation_Failure_vt;
+
+        this.failed_key = alloc( strlen( failed_key ) );
+        this.failed_value = alloc( strlen( failed_value ) );
+        strcpy( this.failed_key, failed_key );
+        strcpy( this.failed_value, failed_value );
+}
+
+void ^?{}( Validation_Failure & this ) with ( this ) {
+        free( failed_key );
+        free( failed_value );
+}
 }
 
@@ -128 +151 @@
                         // Parse the data
                         if ( !entries[j].parse( src_value, entries[j].variable ) ) {
+                                Parse_Failure * ex = new( src_key, src_value );
                                 delete( kv_pairs );
-                                throw (Parse_Failure){};
+                                throw *ex;
                         }
 
                         // Validate the data
                         if ( !entries[j].validate( entries[j].variable ) ) {
+                                Validation_Failure * ex = new( src_key, src_value );
                                 delete( kv_pairs );
-                                throw (Validation_Failure){};
+                                throw *ex;
                         }
 

libcfa/src/parseconfig.hfa

@@ -59 +59 @@
 
 exception Missing_Config_Entries {
-        unsigned int missing;
+        unsigned int num_missing;
 };
 
 void ?{}( Missing_Config_Entries & this );
 
-exception Parse_Failure {};
+exception Parse_Failure {
+        * char failed_key;
+        * char failed_value;
+};
 
 void ?{}( Parse_Failure & this );
 
-exception Validation_Failure {};
+exception Validation_Failure {
+        * char failed_key;
+        * char failed_value;
+};
 
 void ?{}( Validation_Failure & this );