Changeset e54654e

Timestamp:

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

80ae121

Parents:

4cc6c7d

git-author:

Jacob Prud'homme <jafprudhomme@…> (07/16/21 15:18:23)

git-committer:

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

Message:

Added ability to specify optional validation function

File:

• libcfa/src/parseconfig.hfa (modified) (3 diffs)

libcfa/src/parseconfig.hfa

@@ -5 +5 @@
         void * variable;
         bool (*parse)( const char *, void * );
+        bool (*validate)( void * );
 };
 
@@ -14 +15 @@
         this.variable = (void *)&variable;
         this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
+        this.validate = 0p;
+}
+
+forall(T & | { bool parse( const char *, T & ); })
+static inline void ?{}( config_entry & this, const char * key, T & variable, bool (*validate)(T &) ) {
+        this.key      = key;
+        this.variable = (void *)&variable;
+        this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
+        this.validate = (bool (*)(void *))(bool (*)(T &))validate;
 }
 
@@ -21 +31 @@
         this.variable = (void *)&variable;
         this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
+        this.validate = 0p;
+}
+
+forall(T &)
+static inline void ?{}( config_entry & this, const char * key, T & variable, bool (*parse)(const char *, T &), bool (*validate)(T &) ) {
+        this.key      = key;
+        this.variable = (void *)&variable;
+        this.parse    = (bool (*)(const char *, void *))(bool (*)(const char *, T &))parse;
+        this.validate = (bool (*)(void *))(bool (*)(T &))validate;
 }