Changeset ca83227 for libcfa/src/parseconfig.cfa

Timestamp:

Aug 31, 2021, 5:08:10 PM (3 years ago)

Author:

Jacob Prud'homme <jafprudhomme@…>

Branches:

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

Children:

b0f225f

Parents:

45b772c

Message:

Changed API of parse_config to accept parse function

File:

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

libcfa/src/parseconfig.cfa

@@ -77 +77 @@
 
 
-// TODO: Replace KVPairs with vector2 when it's fully functional
-struct KVPairs {
-        size_t size, max_size;
-        * [ * char, * char ] data;
-};
-
 [ void ] ?{}( & KVPairs kvp ) with ( kvp ) {                            // default constructor
         size = 0; max_size = 0; data = 0p;
@@ -157 +151 @@
 
 // Parse configuration values from intermediate format
-[ void ] parse_config( [] const char config_file, [] config_entry entries, size_t num_entries, config_format format ) {
-        * KVPairs kv_pairs = 0p;
-        choose ( format ) {
-                case TABULAR_CONFIG:
-                        kv_pairs = parse_tabular_config_format( config_file, num_entries );
-        }
+[ void ] parse_config(
+                [] const char config_file,
+                [] config_entry entries,
+                size_t num_entries,
+                KVPairs * (*parser)(const char [], size_t)
+) {
+        * KVPairs kv_pairs = parser( config_file, num_entries );
 
         int entries_so_far = 0;