allowing value override

ConfigFileParser.cpp

@@ -24,7 +24,7 @@ void ConfigFileParser::parse(const std::string& path) {
   std::ifstream is(path);
 
   if (!is.good()) {
-    throw ParseExc(0, 0, "valid file", "file I could not open", path);
+    throw ParseFileExc(path);
   }
 
   char c;
@@ -45,12 +45,12 @@ void ConfigFileParser::parse(const std::string& path) {
       case NONE:
         if (std::isspace(c)) continue;
         if (c == '[') {
-          if (tmp.size()) curKV[tmp] = Val{trim(tmp2), valLine, valPos};
+          if (tmp.size()) curKV[tmp] = Val{trim(tmp2), valLine, valPos, path};
           tmp.clear();
           tmp2.clear();
           for (auto h : headers) {
             if (_secs.find(h) != _secs.end()) {
-              _kvs[_secs[h]].insert(curKV.begin(), curKV.end());
+              updateVals(_secs[h], curKV);
             } else {
               _secs[h] = _kvs.size();
               _kvs.push_back(curKV);
@@ -139,12 +139,12 @@ void ConfigFileParser::parse(const std::string& path) {
           continue;
         }
         if (c == '[') {
-          curKV[tmp] = Val{trim(tmp2), valLine, valPos};
+          curKV[tmp] = Val{trim(tmp2), valLine, valPos, path};
           tmp.clear();
           tmp2.clear();
           for (auto h : headers) {
             if (_secs.find(h) != _secs.end()) {
-              _kvs[_secs[h]].insert(curKV.begin(), curKV.end());
+              updateVals(_secs[h], curKV);
             } else {
               _secs[h] = _kvs.size();
               _kvs.push_back(curKV);
@@ -156,7 +156,7 @@ void ConfigFileParser::parse(const std::string& path) {
           continue;
         }
         if (isKeyChar(c)) {
-          curKV[tmp] = Val{trim(tmp2), valLine, valPos};
+          curKV[tmp] = Val{trim(tmp2), valLine, valPos, path};
           tmp.clear();
           tmp2.clear();
           tmp.push_back(c);
@@ -186,12 +186,12 @@ void ConfigFileParser::parse(const std::string& path) {
     throw ParseExc(l, pos, "character", "<EOF>", path);
   }
 
-  if (tmp.size() && tmp2.size()) curKV[tmp] = Val{tmp2, valLine, valPos};
+  if (tmp.size() && tmp2.size()) curKV[tmp] = Val{tmp2, valLine, valPos, path};
   tmp.clear();
   tmp2.clear();
   for (auto h : headers) {
     if (_secs.find(h) != _secs.end()) {
-      _kvs[_secs[h]].insert(curKV.begin(), curKV.end());
+      updateVals(_secs[h], curKV);
     } else {
       _secs[h] = _kvs.size();
       _kvs.push_back(curKV);
@@ -327,3 +327,10 @@ bool ConfigFileParser::hasKey(Sec section, Key key) const {
 
   return true;
 }
+
+// _____________________________________________________________________________
+void ConfigFileParser::updateVals(size_t sec, const KeyVals& kvs) {
+  for (auto& kv : kvs) {
+    _kvs[sec][kv.first] = kv.second;
+  }
+}

ConfigFileParser.h

@@ -16,6 +16,7 @@ struct Val {
   std::string val;
   size_t line;
   size_t pos;
+  std::string file;
 };
 
 typedef std::string Key;
@@ -34,6 +35,19 @@ enum State {
   IN_KEY_VAL_VAL_HANG_END
 };
 
+class ParseFileExc : public std::exception {
+ public:
+  ParseFileExc(const std::string file) : _file(file) {
+    std::stringstream ss;
+    ss << _file << ": Could not open file.";
+    _msg = ss.str();
+  };
+  virtual const char* what() const throw() { return _msg.c_str(); }
+
+ private:
+  std::string _file, _msg;
+};
+
 class ParseExc : public std::exception {
  public:
   ParseExc(size_t l, size_t p, std::string exc, std::string f, std::string file)
@@ -81,5 +95,7 @@ class ConfigFileParser {
   bool isKeyChar(char t) const;
   std::string trim(const std::string& str) const;
   bool toBool(std::string str) const;
+
+  void updateVals(size_t sec, const KeyVals& kvs);
 };
 }