Changeset 58ebd78 for libcfa

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:

8f01cb04

Parents:

7582458

git-author:

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

git-committer:

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

Message:

Made some small changes

Comments, spacing, etc.

Location:

libcfa/src

Files:

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

libcfa/src/parseconfig.cfa

@@ -7 +7 @@
         * [ char *, char * ] data;
 };
-void ?{}( VLA & vla ) with ( vla ) {    // default constructor
+void ?{}( KVPairs & kvp ) with ( kvp ) {        // default constructor
         size = 0; max_size = 0; data = 0p;
 }
-void ?{}( VLA & vla, int size, char fill = ['\0', '\0'] ) { // initialization
-        vla.[ size, max_size, data ] = [ 0, max_size, alloc( size, fill ) ];
+void ?{}( KVPairs & kvp, int size ) {           // initialization
+        kvp.[ size, max_size ] = [ 0, size ];
+        kvp.data = alloc( size );
 }
-void ?{}( VLA & vla, VLA val ) with( val ) { // copy, deep
-        vla.[ size, max_size, data ] = [ size, max_size, alloc( size, data ) ];
-}
-void ^?{}( VLA & vla ) with ( vla ) {   // destructor
+void ^?{}( KVPairs & kvp ) with ( kvp ) {       // destructor
         free( data );
         size = 0; max_size = 0; data = 0p;
 }
 
-void add_kv_pair( KVPairs kv_pairs, char * k, char * v ) with( kv_pairs ) {
+void add_kv_pair( KVPairs kv_pairs, char * k, char * v ) with ( kv_pairs ) {
         if ( size == max_size ) {
-                max_size = max_size * 2;
+                max_size *= 2;
                 data = resize( data, max_size );
         }
@@ -42 +40 @@
 
 // Parse configuration from a file formatted in shell style
-KVPairs & parse_shell_config_format( const char * config_file ) {
-        KVPairs kv_pairs{ num_entries };
+KVPairs & parse_shell_config_format( const char * config_file, size_t num_entries ) {
+        KVPairs kv_pairs = { num_entries };
 
         ifstream in;
@@ -69 +67 @@
 }
 
-// Process the configuration file to set the simulation parameters.
+// Parse configuration values from intermediate format
 void parse_config( const char * config_file, config_entry entries[], size_t num_entries ) {
-        KVPairs kv_pairs = parse_shell_config_format( config_file );
+        KVPairs kv_pairs = parse_shell_config_format( config_file, num_entries );
 
-        // *** WE MUST ALLOW SOME SORT OF VALIDATION FUNCTIONALITY TOO!!! ***
         int entries_so_far = 0;
         for ( i; kv_pairs.size ) {
@@ -88 +85 @@
                         }
 
-                        serr | "Value " | src_value | " for key " | dest_key | " could not be parsed";
+                        serr | "Value '" | src_value | "' for key '" | src_key | "' could not be parsed";
                 }
         }

libcfa/src/parseconfig.hfa

@@ -4 +4 @@
         const char * key;
         void * variable;
-        bool (*parse)(const char *, void *);
+        bool (*parse)( const char *, void * );
 };
 
 static inline void ?{}( config_entry & this ) {}
 
-forall(T & | { bool parse(const char *, T & ); })
+forall(T & | { bool parse( const char *, T & ); })
 static inline void ?{}( config_entry & this, const char * key, T & variable ) {
         this.key      = key;