Changeset d8db0af for libcfa/src

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:

a434e92

Parents:

ad78e08

git-author:

Jacob Prud'homme <jafprudhomme@…> (08/05/21 23:25:24)

git-committer:

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

Message:

Allowed config format to be specified

Location:

libcfa/src

Files:

• parseconfig.cfa (modified) (3 diffs)
• parseconfig.hfa (modified) (2 diffs)

libcfa/src/parseconfig.cfa

@@ -66 +66 @@
 
 // Parse configuration from a file formatted in shell style
-KVPairs & parse_tabular_config_format( const char * config_file, size_t num_entries ) {
+KVPairs * parse_tabular_config_format( const char * config_file, size_t num_entries ) {
         * KVPairs kv_pairs = new( num_entries );
 
@@ -93 +93 @@
         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 );
+void parse_config( const char * config_file, config_entry entries[], size_t num_entries, config_format format ) {
+        KVPairs * kv_pairs;
+        choose ( format ) {
+                case TABULAR_CONFIG:
+                        kv_pairs = parse_tabular_config_format( config_file, num_entries );
+                default:
+                        exit | "Error: config file format " | format | " is not supported";
+        }
 
         int entries_so_far = 0;
-        for ( i; kv_pairs.size ) {
+        for ( i; kv_pairs->size ) {
           if ( entries_so_far == num_entries ) break;
 
                 char * src_key, * src_value;
-                [ src_key, src_value ] = kv_pairs.data[i];
+                [ src_key, src_value ] = kv_pairs->data[i];
 
                 for ( j; num_entries ) {
@@ -123 +129 @@
                 }
         }
+
+        ^(*kv_pairs){};
 } // processConfigFile
 

libcfa/src/parseconfig.hfa

@@ -6 +6 @@
 // *********************************** initial declarations ***********************************
 
+
+enum config_format {
+        TABULAR_CONFIG
+};
 
 struct config_entry {
@@ -63 +67 @@
 
 
-void parse_config( const char * config_file, config_entry entries[], size_t num_entries );
+void parse_config( const char * config_file, config_entry entries[], size_t num_entries, config_format format );
 
 bool parse( const char *, const char * & );