peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesse Beder
2015-01-24 13:24:08 -06:00
parent 0c280724e9 2c340f0546
commit 9eae039c91
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/node/impl.h
View File

@@ -393,6 +393,7 @@ inline const Node Node::operator[](const Node& key) const {
throw InvalidNode(); throw InvalidNode();
EnsureNodeExists(); EnsureNodeExists();
key.EnsureNodeExists(); key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value = detail::node& value =
static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory); static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory); return Node(value, m_pMemory);
@@ -403,6 +404,7 @@ inline Node Node::operator[](const Node& key) {
throw InvalidNode(); throw InvalidNode();
EnsureNodeExists(); EnsureNodeExists();
key.EnsureNodeExists(); key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory); detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory); return Node(value, m_pMemory);
} }

11
test/node/node_test.cpp
View File

@@ -261,6 +261,17 @@ TEST(NodeTest, CloneNull) {
EXPECT_EQ(NodeType::Null, clone.Type()); EXPECT_EQ(NodeType::Null, clone.Type());
} }
TEST(NodeTest, KeyNodeExitsScope) {
Node node;
{
Node temp("Hello, world");
node[temp] = 0;
}
for (const auto& kv : node) {
(void)kv;
}
}
TEST(NodeTest, DefaultNodeStyle) { TEST(NodeTest, DefaultNodeStyle) {
Node node; Node node;
EXPECT_EQ(EmitterStyle::Default, node.Style()); EXPECT_EQ(EmitterStyle::Default, node.Style());