Changeset e4b37a1

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:

ad78e08

Parents:

12b5b226

git-author:

Jacob Prud'homme <jafprudhomme@…> (08/03/21 13:23:35)

git-committer:

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

Message:

Switched to allocating array of KVPs on heap

File:

• libcfa/src/parseconfig.cfa (modified) (5 diffs)

libcfa/src/parseconfig.cfa

@@ -24 +24 @@
 
 struct KVPairs {
-        int size, max_size;
+        unsigned int size, max_size;
         * [ char *, char * ] data;
 };
@@ -30 +30 @@
         size = 0; max_size = 0; data = 0p;
 }
-void ?{}( KVPairs & kvp, int size ) {                                   // initialization
+void ?{}( KVPairs & kvp, size_t size ) {                                // initialization
         kvp.[ size, max_size ] = [ 0, size ];
         kvp.data = alloc( size );
@@ -64 +64 @@
 // Parse configuration from a file formatted in shell style
 KVPairs & parse_tabular_config_format( const char * config_file, size_t num_entries ) {
-        KVPairs kv_pairs = { num_entries };
+        * KVPairs kv_pairs = new( num_entries );
 
         ifstream in;
@@ -79 +79 @@
                         in | value;
 
-                        add_kv_pair( kv_pairs, key, value );
+                        add_kv_pair( *kv_pairs, key, value );
 
                   if ( eof( in ) ) break;
@@ -85 +85 @@
                 } // for
         } catch( Open_Failure * ex; ex->istream == &in ) {
-                ^kv_pairs{};
+                ^(*kv_pairs){};
                 exit | "Error: could not open input file \"" | config_file | "\"";
         } // try
         close( in );
 
-        return kv_pairs;
+        return *kv_pairs;
 }
 
 // Parse configuration values from intermediate format
 void parse_config( const char * config_file, config_entry entries[], size_t num_entries ) {
-        KVPairs kv_pairs = parse_tabular_config_format( config_file, num_entries );
+        KVPairs & kv_pairs = parse_tabular_config_format( config_file, num_entries );
 
         int entries_so_far = 0;