Changeset a3f2a3e for libcfa/src

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:

c166f4e

Parents:

1764a63

git-author:

Jacob Prud'homme <jafprudhomme@…> (08/13/21 17:10:06)

git-committer:

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

Message:

Simplified validation logic

Location:

libcfa/src

Files:

• parseconfig.cfa (modified) (2 diffs)
• parseconfig.hfa (modified) (3 diffs)

libcfa/src/parseconfig.cfa

@@ -119 +119 @@
                 for ( j; num_entries ) {
                   if ( strcmp( src_key, entries[j].key ) != 0 ) continue;
+                        // Parse the data
                         if ( !entries[j].parse( src_value, entries[j].variable ) ) {
                                 delete( kv_pairs );
@@ -124 +125 @@
                         }
 
-                        // Validate the parsed data, if necessary
-                        if ( entries[j].validate != (bool (*)(void *))0p
-                                        && !entries[j].validate( entries[j].variable ) ) {
+                        // Validate the data
+                        if ( !entries[j].validate( entries[j].variable ) ) {
                                 delete( kv_pairs );
                                 throw (Validation_Failure){};

libcfa/src/parseconfig.hfa

@@ -18 +18 @@
 };
 
+bool null_validator( void * ) { return true; }
+
 static inline void ?{}( config_entry & this ) {}
 
@@ -25 +27 @@
         this.variable = (void *)&variable;
         this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
-        this.validate = (bool (*)(void *))(bool (*)(T &))0p;
+        this.validate = null_validation;
 }
 
@@ -41 +43 @@
         this.variable = (void *)&variable;
         this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
-        this.validate = (bool (*)(void *))(bool (*)(T &))0p;
+        this.validate = null_validation;
 }