Changeset ca83227


Ignore:
Timestamp:
Aug 31, 2021, 5:08:10 PM (5 months ago)
Author:
Jacob Prud'homme <jafprudhomme@…>
Branches:
jacob/cs343-translation, master
Children:
b0f225f
Parents:
45b772c
Message:

Changed API of parse_config to accept parse function

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/parseconfig.cfa

    r45b772c rca83227  
    7777
    7878
    79 // TODO: Replace KVPairs with vector2 when it's fully functional
    80 struct KVPairs {
    81         size_t size, max_size;
    82         * [ * char, * char ] data;
    83 };
    84 
    8579[ void ] ?{}( & KVPairs kvp ) with ( kvp ) {                            // default constructor
    8680        size = 0; max_size = 0; data = 0p;
     
    157151
    158152// Parse configuration values from intermediate format
    159 [ void ] parse_config( [] const char config_file, [] config_entry entries, size_t num_entries, config_format format ) {
    160         * KVPairs kv_pairs = 0p;
    161         choose ( format ) {
    162                 case TABULAR_CONFIG:
    163                         kv_pairs = parse_tabular_config_format( config_file, num_entries );
    164         }
     153[ void ] parse_config(
     154                [] const char config_file,
     155                [] config_entry entries,
     156                size_t num_entries,
     157                KVPairs * (*parser)(const char [], size_t)
     158) {
     159        * KVPairs kv_pairs = parser( config_file, num_entries );
    165160
    166161        int entries_so_far = 0;
  • libcfa/src/parseconfig.hfa

    r45b772c rca83227  
    66// *********************************** initial declarations ***********************************
    77
    8 
    9 enum config_format {
    10         TABULAR_CONFIG
    11 };
    128
    139struct config_entry {
     
    5450}
    5551
     52// TODO: Replace KVPairs with vector2 when it's fully functional
     53struct KVPairs {
     54        size_t size, max_size;
     55        * [ * char, * char ] data;
     56};
     57
     58[ void ] add_kv_pair( & KVPairs kv_pairs, [] char key, [] char value );
     59
    5660
    5761// *********************************** exceptions ***********************************
     
    8286
    8387
    84 void parse_config( const char * config_file, config_entry entries[], size_t num_entries, config_format format );
     88[ * KVPairs ] parse_tabular_config_format( [] const char config_file, size_t num_entries );
     89
     90[ void ] parse_config(
     91        [] const char config_file,
     92        [] config_entry entries,
     93        size_t num_entries,
     94        KVPairs * (*parser)(const char [], size_t)
     95);
    8596
    8697bool parse( const char *, const char * & );
  • tests/parseconfig.cfa

    r45b772c rca83227  
    5050        sout | "Different types of destination addresses";
    5151
    52         parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     52        parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    5353
    5454    sout | "Stop cost: " | config_params.stop_cost;
     
    6868        sout | "Open_Failure thrown when config file does not exist";
    6969        try {
    70                 parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     70                parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    7171        } catch( Open_Failure * ex ) {
    7272                sout | "Failed to open the config file";
     
    7777        sout | "Missing_Config_Entries thrown when config file is missing entries we want";
    7878        try {
    79                 parse_config( xstr(IN_DIR) "parseconfig-missing.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     79                parse_config( xstr(IN_DIR) "parseconfig-missing.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    8080        } catch( Missing_Config_Entries * ex ) {
    8181                msg( ex );
     
    9292
    9393        try {
    94                 parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entry, 1, TABULAR_CONFIG );
     94                parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entry, 1, parse_tabular_config_format );
    9595        } catch( Parse_Failure * ex ) {
    9696                msg( ex );
     
    106106
    107107        try {
    108                 parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     108                parse_config( xstr(IN_DIR) "parseconfig-errors.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    109109        } catch( Validation_Failure * ex ) {
    110110                msg( ex );
     
    115115        sout | "No error is thrown when validation succeeds";
    116116        config_params.stop_cost = -1; // Reset value
    117         parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     117        parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    118118        sout | "Stop cost: " | config_params.stop_cost;
    119119        sout | nl;
     
    126126
    127127        config_params.stop_cost = -1; // Reset value
    128         parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     128        parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    129129
    130130        sout | "Stop cost: " | config_params.stop_cost;
     
    139139
    140140        config_params.stop_cost = -1; // Reset value
    141         parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, TABULAR_CONFIG );
     141        parse_config( xstr(IN_DIR) "parseconfig-all.txt", entries, NUM_ENTRIES, parse_tabular_config_format );
    142142
    143143        sout | "Stop cost: " | config_params.stop_cost;
Note: See TracChangeset for help on using the changeset viewer.