chore: new config from base config

Author: vinniefalco

lib/Tool/ConfigImpl.cpp

@@ -70,11 +70,16 @@ ConfigImpl(
     llvm::StringRef workingDir_,
     llvm::StringRef addonsDir_,
     llvm::StringRef configYaml_,
-    llvm::StringRef extraYaml_)
+    llvm::StringRef extraYaml_,
+    ConfigImpl const* base)
 {
     namespace fs = llvm::sys::fs;
     namespace path = llvm::sys::path;
 
+    // copy the base settings if present
+    if(base)
+        settings_ = base->settings_;
+
     if(! files::isAbsolute(workingDir_))
         formatError("working path \"{}\" is not absolute", workingDir_).Throw();
     settings_.workingDir = files::makeDirsy(files::normalizePath(workingDir_));
@@ -187,7 +192,7 @@ createConfigFromYAML(
     try
     {
         auto config = std::make_shared<ConfigImpl>(
-            workingDir, addonsDir, configYaml, extraYaml);
+            workingDir, addonsDir, configYaml, extraYaml, nullptr);
         return config;
     }
     catch(Exception const& ex)
@@ -200,7 +205,8 @@ Expected<std::shared_ptr<ConfigImpl const>>
 loadConfigFile(
     std::string_view configFilePath,
     std::string_view addonsDir,
-    std::string_view extraYaml)
+    std::string_view extraYaml,
+    std::shared_ptr<ConfigImpl const> base)
 {
     namespace fs = llvm::sys::fs;
     namespace path = llvm::sys::path;
@@ -222,7 +228,7 @@ loadConfigFile(
     try
     {
         auto config = std::make_shared<ConfigImpl>(
-            workingDir, addonsDir, *text, extraYaml);
+            workingDir, addonsDir, *text, extraYaml, base.get());
         return config;
     }
     catch(Exception const& ex)

lib/Tool/ConfigImpl.hpp

@@ -47,7 +47,8 @@ class ConfigImpl
         FileFilter input;
     };
 
-    Settings const& settings() const noexcept
+    Settings const&
+    settings()const noexcept override
     {
         return settings_;
     }
@@ -78,7 +79,8 @@ class ConfigImpl
         llvm::StringRef workingDir,
         llvm::StringRef addonsDir,
         llvm::StringRef configYaml,
-        llvm::StringRef extraYaml);
+        llvm::StringRef extraYaml,
+        ConfigImpl const* base);
 
     ThreadPool&
     threadPool() const noexcept override
@@ -219,13 +221,18 @@ createConfigFromYAML(
     @param extraYaml An optional string containing
     additional valid YAML which will be parsed and
     applied to the existing configuration.
+
+    @param baseConfig An optional configuration
+    object. If specified, its settings will be
+    first copied before the file is loaded.
 */
 MRDOX_DECL
 Expected<std::shared_ptr<ConfigImpl const>>
 loadConfigFile(
     std::string_view configFilePath,
     std::string_view addonsDir,
-    std::string_view extraYaml = "");
+    std::string_view extraYaml = "",
+    std::shared_ptr<ConfigImpl const> base = nullptr);
 
 /** Create a configuration by loading a YAML string.