Changeset e74ba77 for libcfa/src

Timestamp:

Aug 31, 2021, 1:49:09 AM (4 years ago)

Author:

Jacob Prud'homme <jafprudhomme@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

52c6891

Parents:

ad8072c

git-author:

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

git-committer:

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

Message:

Switched to allocating KVPairs on heap

File:

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

libcfa/src/parseconfig.cfa

@@ -27 +27 @@
         * [ char *, char * ] data;
 };
-void ?{}( KVPairs & kvp ) with ( kvp ) {        // default constructor
+void ?{}( KVPairs & kvp ) with ( kvp ) {                                // default constructor
         size = 0; max_size = 0; data = 0p;
 }
-void ?{}( KVPairs & kvp, int size ) {           // initialization
+void ?{}( KVPairs & kvp, int size ) {                                   // initialization
         kvp.[ size, max_size ] = [ 0, size ];
         kvp.data = alloc( size );
 }
-void ^?{}( KVPairs & kvp ) with ( kvp ) {       // destructor
+/*
+void ?{}( KVPairs & kvp, KVPairs val ) with( val ) {    // copy, deep
+        kvp.[ size, max_size ] = [ size, max_size ];
+        kvp.data = alloc( size, data );
+}
+*/
+void ^?{}( KVPairs & kvp ) with ( kvp ) {                               // destructor
         free( data );
         size = 0; max_size = 0; data = 0p;
@@ -61 +67 @@
 // Parse configuration from a file formatted in shell style
 KVPairs & parse_shell_config_format( const char * config_file, size_t num_entries ) {
-        KVPairs kv_pairs = { num_entries };
+        * KVPairs kv_pairs;// = { num_entries };
 
         ifstream in;
@@ -74 +80 @@
                         in | value;
 
-                        add_kv_pair( kv_pairs, key, value );
+                        add_kv_pair( *kv_pairs, key, value );
 
                   if ( fail( in ) ) break;
@@ -84 +90 @@
         close( in );
 
-        return kv_pairs;
+        return *kv_pairs;
 }