Changes in libcfa/src/parseconfig.cfa [b5e725a:6a93e4d]

File:

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

libcfa/src/parseconfig.cfa

@@ -16 +16 @@
 #pragma GCC visibility push(default)
 
-
 // *********************************** exceptions ***********************************
 
+
+// TODO: Add names of missing config entries to exception (see further below)
+vtable(Missing_Config_Entries) Missing_Config_Entries_vt;
 
 [ void ] ?{}( & Missing_Config_Entries this, unsigned int num_missing ) {
@@ -27 +29 @@
 // TODO: use string interface when it's ready (and implement exception msg protocol)
 [ void ] msg( * Missing_Config_Entries ex ) {
-        serr | "The config file is missing " | ex->num_missing | "entr" | nosep | (ex->num_missing == 1 ? "y." : "ies.");
+        serr | "The config file is missing " | ex->num_missing | "entr" | sepOff | (ex->num_missing == 1 ? "y." : "ies.");
 } // msg
 
+
+vtable(Parse_Failure) Parse_Failure_vt;
 
 [ void ] ?{}( & Parse_Failure this, [] char failed_key, [] char failed_value ) {
@@ -50 +54 @@
 }
 
+
+vtable(Validation_Failure) Validation_Failure_vt;
 
 [ void ] ?{}( & Validation_Failure this, [] char failed_key, [] char failed_value ) {
@@ -106 +112 @@
 
 
-static [ bool ] comments( & ifstream in, size_t size, [] char name ) {
+static [ bool ] comments( & ifstream in, [] char name ) {
         while () {
-                in | wdi( size, name );
+                in | name;
           if ( eof( in ) ) return true;
           if ( name[0] != '#' ) return false;
@@ -130 +136 @@
                         // NOTE: Must add check to see if already read in value for this key,
                         // once we switch to using hash table as intermediate storage
-                        if ( comments( in, 64, key ) ) break;   // eof ?
-                        in | wdi( 256, value );
+                  if ( comments( in, key ) ) break;                     // eof ?
+                        in | value;
 
                         add_kv_pair( *kv_pairs, key, value );