Changeset 4df8fef5

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:

5e0e488

Parents:

31337d8

git-author:

Jacob Prud'homme <jafprudhomme@…> (07/13/21 12:36:19)

git-committer:

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

Message:

Restructured parseconfig to work like parseargs

Location:

libcfa/src

Files:

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

libcfa/src/parseconfig.cfa

@@ -13 +13 @@
 
 // Process the configuration file to set the simulation parameters.
-void parseConfig( const char * configFile, ConfigParms & cparms ) {
-                ifstream in;
+void parse_config( const char * config_file, config_entry entries[], size_t num_entries ) {
+        ifstream in;
         try {
-                open( in, configFile );                                                 // open the configuration file for input
+                open( in, config_file );                                                        // open the configuration file for input
 
                 while () {
-                  if ( comments( in, name ) ) break;                    // eof ?
+                        char * key;
+                        char * value;
+                  if ( comments( in, key ) ) break;                     // eof ?
                         // Should we just overwrite duplicate config entries? Having a hash map would make this much easier
                         in | value;
@@ -31 +33 @@
                 } // for
         } catch( Open_Failure * ex; ex->istream == &in ) {
-                exit | "Error: could not open input file \"" | configFile | "\"";
+                exit | "Error: could not open input file \"" | config_file | "\"";
         } // try
         close( in );

libcfa/src/parseconfig.hfa

@@ -15 +15 @@
 }; // ConfigParms
 
-void parseConfig( const char * configFile, ConfigParms & cparms );
+struct config_entry {
+        const char * key;
+        void * variable;
+        bool (*parse)(const char *, void *);
+};
+
+static inline void ?{}( config_entry & this ) {}
+
+forall(T & | { bool parse(const char *, T & ); })
+static inline void ?{}( config_entry & this, const char * key, T & variable ) {
+        this.key      = key;
+        this.variable = (void *)&variable;
+        this.parse    = (bool (*)(const char *, void *))parse;
+}
+
+forall(T &)
+static inline void ?{}( config_entry & this, const char * key, T & variable, bool (*parse)(const char *, T &) ) {
+        this.key      = key;
+        this.variable = (void *)&variable;
+        this.parse    = (bool (*)(const char *, void *))parse;
+}
+
+void parse_config( const char * config_file, config_entry entries[], size_t num_entries );
 
 // Local Variables: //