Add TomlConfig typedef to insulate downstream code from TOML library

Author: stanbot8

src/core/param/param.cc

@@ -146,7 +146,7 @@ void Param::MergeJsonPatch(const std::string& patch) {
 }
 
 // -----------------------------------------------------------------------------
-void AssignThreadSafetyMechanism(const toml::table& config, Param* param) {
+void AssignThreadSafetyMechanism(const TomlConfig& config, Param* param) {
   auto value =
       config.at_path("simulation.thread_safety_mechanism").value<std::string>();
   if (!value) {
@@ -164,7 +164,7 @@ void AssignThreadSafetyMechanism(const toml::table& config, Param* param) {
 }
 
 // -----------------------------------------------------------------------------
-void AssignMappedDataArrayMode(const toml::table& config, Param* param) {
+void AssignMappedDataArrayMode(const TomlConfig& config, Param* param) {
   auto value =
       config.at_path("performance.mapped_data_array_mode").value<std::string>();
   if (!value) {
@@ -186,7 +186,7 @@ void AssignMappedDataArrayMode(const toml::table& config, Param* param) {
 }
 
 // -----------------------------------------------------------------------------
-void AssignBoundSpaceMode(const toml::table& config, Param* param) {
+void AssignBoundSpaceMode(const TomlConfig& config, Param* param) {
   auto value = config.at_path("simulation.bound_space").value<std::string>();
   if (!value) {
     return;
@@ -206,7 +206,7 @@ void AssignBoundSpaceMode(const toml::table& config, Param* param) {
 }
 
 // -----------------------------------------------------------------------------
-void Param::AssignFromConfig(const toml::table& config) {
+void Param::AssignFromConfig(const TomlConfig& config) {
   // group parameters
   for (auto& el : groups_) {
     el.second->AssignFromConfig(config);

src/core/param/param.h

@@ -645,7 +645,7 @@ struct Param {
   bool plot_memory_layout = false;
 
   /// Assign values from config file to variables
-  void AssignFromConfig(const toml::table&);
+  void AssignFromConfig(const TomlConfig&);
 
  private:
   friend class DiffusionTest_CopyOldData_Test;

src/core/param/param_group.cc

@@ -28,6 +28,6 @@ ParamGroupUid ParamGroupUidGenerator::NewUid() { return counter_++; }
 
 ParamGroup::~ParamGroup() = default;
 
-void ParamGroup::AssignFromConfig(const toml::table&) {}
+void ParamGroup::AssignFromConfig(const TomlConfig&) {}
 
 }  // namespace bdm

src/core/param/param_group.h

@@ -21,6 +21,10 @@
 
 namespace bdm {
 
+/// Typedef for TOML config table, insulating downstream code from the
+/// concrete TOML library in use.
+using TomlConfig = toml::table;
+
 struct Param;
 
 using ParamGroupUid = uint64_t;
@@ -52,7 +56,7 @@ struct ParamGroup {
  protected:
   /// Assign values from a toml config file.\n
   /// Can be omitted if toml file support is not required.
-  virtual void AssignFromConfig(const toml::table&);
+  virtual void AssignFromConfig(const TomlConfig&);
 
  private:
   friend struct Param;

src/neuroscience/param.cc

@@ -20,7 +20,7 @@ namespace neuroscience {
 
 const ParamGroupUid Param::kUid = ParamGroupUidGenerator::Get()->NewUid();
 
-void Param::AssignFromConfig(const toml::table& config) {
+void Param::AssignFromConfig(const TomlConfig& config) {
   BDM_ASSIGN_CONFIG_VALUE(neurite_default_actual_length,
                           "neuroscience.neurite_default_actual_length");
   BDM_ASSIGN_CONFIG_VALUE(neurite_default_density,

src/neuroscience/param.h

@@ -107,7 +107,7 @@ struct Param : public ParamGroup {
 
  protected:
   /// Assign values from config file to variables
-  void AssignFromConfig(const toml::table&) override;
+  void AssignFromConfig(const TomlConfig&) override;
 };
 
 }  // namespace neuroscience