External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change insert_map_pair to always append

Browse Source 
Always append in insert_map_pair even if the key is already present.
This breaks the behavior of force_insert which now always inserts KVs
even if the key is already present. The first insert for duplicated keys
now takes precedence for lookups.
This commit is contained in:
Kal Conley 2016-06-13 06:57:58 +02:00
parent f327b19e93
commit 3213df1ac6
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/node_data.cpp
View File

@ -256,18 +256,7 @@ void node_data::reset_map() {
} }
void node_data::insert_map_pair(node& key, node& value) { void node_data::insert_map_pair(node& key, node& value) {
m_map.emplace_back(&key, &value);
bool found = false;
for (auto& entry : m_map) {
if (entry.first == &key) {
entry.second = &value;
found = true;
break;
}
}
if (!found) {
m_map.emplace_back(&key, &value);
}
if (!key.is_defined() || !value.is_defined()) if (!key.is_defined() || !value.is_defined())
m_undefinedPairs.emplace_back(&key, &value); m_undefinedPairs.emplace_back(&key, &value);

4
test/node/node_test.cpp
View File

@ -95,8 +95,8 @@ TEST(NodeTest, MapForceInsert) {
node.force_insert(k2, v2); node.force_insert(k2, v2);
EXPECT_EQ("v1", node["k1"].as<std::string>()); EXPECT_EQ("v1", node["k1"].as<std::string>());
EXPECT_EQ("v2", node["k2"].as<std::string>()); EXPECT_EQ("v1", node["k2"].as<std::string>());
EXPECT_EQ(2, node.size()); EXPECT_EQ(3, node.size());
} }
TEST(NodeTest, UndefinedConstNodeWithFallback) { TEST(NodeTest, UndefinedConstNodeWithFallback) {