Merge pull request #23

Clear containers before populating them with values

Author: kamchatka-volcano

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.18)
-project(figcone VERSION 3.1.0)
+project(figcone VERSION 3.2.0)
 include(external/seal_lake)
 
 SealLake_IsInstallEnabled(INSTALL_FIGCONE_TREE)
@@ -101,7 +101,7 @@ if (FIGCONE_USE_ALL OR FIGCONE_USE_JSON OR FIGCONE_USE_YAML OR FIGCONE_USE_TOML
             figcone::figcone_formats
     )
     SealLake_AddDependencies(
-            figcone_formats 1.1.0
+            figcone_formats 1.2.0
     )
 endif ()
 

formats/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(figcone_formats VERSION 1.1.0)
+project(figcone_formats VERSION 1.2.0)
 
 option(FIGCONE_USE_ALL  "Enable all supported config formats" ON)
 option(FIGCONE_USE_JSON "Enable JSON config format" OFF)
@@ -64,9 +64,9 @@ endif()
 
 if(FIGCONE_USE_ALL OR FIGCONE_USE_XML)
     SealLake_Import(
-            figcone_xml 1.1.0
+            figcone_xml 1.2.0
             GIT_REPOSITORY https://github.com/kamchatka-volcano/figcone_xml.git
-            GIT_TAG v1.1.0
+            GIT_TAG v1.2.0
     )
     SealLake_Copy(
             WILDCARDS ${figcone_xml_SOURCE_DIR}/include/figcone_xml/*

include/figcone/detail/dict.h

@@ -38,11 +38,11 @@ class Dict : public INode {
     {
         hasValue_ = true;
         position_ = node.position();
+        dictMap_ = TMap{};
         if (!node.isItem())
             throw ConfigError{"Dictionary '" + name_ + "': config node can't be a list.", node.position()};
         if constexpr (sfun::is_optional_v<TMap>)
             dictMap_.emplace();
-        maybeOptValue(dictMap_).clear();
 
         for (const auto& paramName : node.asItem().paramNames()) {
             const auto& paramValue = node.asItem().param(paramName);

include/figcone/detail/nodelist.h

@@ -42,6 +42,7 @@ class NodeList : public detail::INode {
     {
         hasValue_ = true;
         position_ = nodeList.position();
+        nodeList_ = TCfgList{};
         if (!nodeList.isList())
             throw ConfigError{"Node list '" + name_ + "': config node must be a list.", nodeList.position()};
         if constexpr (sfun::is_optional<TCfgList>::value)

include/figcone/detail/paramlist.h

@@ -38,6 +38,7 @@ class ParamList : public IParam {
     {
         position_ = paramList.position();
         hasValue_ = true;
+        paramListValue_ = TParamList{};
         if constexpr (sfun::is_optional_v<TParamList>)
             paramListValue_.emplace();
 

tests/test_paramlist.cpp

@@ -406,4 +406,21 @@ TEST(TestParamList, DefaultValue)
     EXPECT_EQ(cfg.testIntList.at(2), 3);
 }
 
+TEST(TestParamList, OverwriteDefaultValue)
+{
+    ///testStrList = []
+    ///
+    auto tree = figcone::makeTreeRoot();
+    tree->asItem().addParamList("testStrList", std::vector<std::string>{}, {1, 1});
+    tree->asItem().addParamList("testIntList", std::vector<std::string>{"42", "43"}, {1, 1});
+    auto parser = TreeProvider{std::move(tree)};
+    auto cfgReader = figcone::ConfigReader{figcone::NameFormat::CamelCase};
+    auto cfg = cfgReader.read<CfgStr>("", parser);
+
+    ASSERT_EQ(cfg.testStrList.size(), 0);
+    ASSERT_EQ(cfg.testIntList.size(), 2);
+    EXPECT_EQ(cfg.testIntList.at(0), 42);
+    EXPECT_EQ(cfg.testIntList.at(1), 43);
+}
+
 } //namespace test_paramlist

tests_static_refl/test_paramlist_cpp20.cpp

@@ -266,4 +266,21 @@ TEST(StaticReflTestParamList, DefaultValue)
     EXPECT_EQ(cfg.testIntList.at(2), 3);
 }
 
+TEST(TestParamList, OverwriteDefaultValue)
+{
+    ///testStrList = []
+    ///
+    auto tree = figcone::makeTreeRoot();
+    tree->asItem().addParamList("testStrList", std::vector<std::string>{}, {1, 1});
+    tree->asItem().addParamList("testIntList", std::vector<std::string>{"42", "43"}, {1, 1});
+    auto parser = TreeProvider{std::move(tree)};
+    auto cfgReader = figcone::ConfigReader{figcone::NameFormat::CamelCase};
+    auto cfg = cfgReader.read<CfgStr>("", parser);
+
+    ASSERT_EQ(cfg.testStrList.size(), 0);
+    ASSERT_EQ(cfg.testIntList.size(), 2);
+    EXPECT_EQ(cfg.testIntList.at(0), 42);
+    EXPECT_EQ(cfg.testIntList.at(1), 43);
+}
+
 } //namespace test_paramlist