include mechanism

ConfigFileParser.cpp

@@ -44,7 +44,7 @@ void ConfigFileParser::parse(const std::string& path) {
     switch (s) {
       case NONE:
         if (std::isspace(c)) continue;
-        if (c == '[') {
+        if (c == '[' || c == '<') {
           if (tmp.size()) curKV[tmp] = Val{trim(tmp2), valLine, valPos, path};
           tmp.clear();
           tmp2.clear();
@@ -58,7 +58,8 @@ void ConfigFileParser::parse(const std::string& path) {
           }
           headers.clear();
           curKV.clear();
-          s = IN_HEAD;
+          if (c == '[') s = IN_HEAD;
+          if (c == '<') s = IN_INC;
           continue;
         }
         if (isKeyChar(c)) {
@@ -69,6 +70,19 @@ void ConfigFileParser::parse(const std::string& path) {
         }
         throw ParseExc(l, pos, "header or key", std::string("'") + c + "'",
                        path);
+
+      case IN_INC:
+        if (c == '\n') {
+          throw ParseExc(l, pos, ">", "<newline>", path);
+        } else if (c == '>') {
+          parse(tmp);
+          tmp.clear();
+          s = NONE;
+        } else {
+          tmp += c;
+        }
+        continue;
+
       case IN_HEAD:
         if (std::isspace(c)) continue;
         if (isKeyChar(c)) {
@@ -319,6 +333,11 @@ const Val& ConfigFileParser::getVal(Sec section, Key key) const {
 }
 
 // _____________________________________________________________________________
+const KeyVals& ConfigFileParser::getKeyVals(Sec section) const {
+  return _kvs[_secs.find(section)->second];
+}
+
+// _____________________________________________________________________________
 bool ConfigFileParser::hasKey(Sec section, Key key) const {
   if (_secs.find(section) == _secs.end()) return false;
   if (_kvs[_secs.find(section)->second].find(key) ==

ConfigFileParser.h

@@ -26,6 +26,7 @@ typedef std::unordered_map<std::string, Val> KeyVals;
 enum State {
   NONE,
   IN_HEAD,
+  IN_INC,
   IN_HEAD_KEY,
   IN_HEAD_AW_COM_OR_END,
   IN_KEY_VAL_KEY,
@@ -87,6 +88,7 @@ class ConfigFileParser {
   bool hasKey(Sec section, Key key) const;
 
   const Val& getVal(Sec section, Key key) const;
+  const KeyVals& getKeyVals(Sec section) const;
 
  private:
   std::unordered_map<std::string, size_t> _secs;