Commit 9eae039c authored by Jesse Beder's avatar Jesse Beder
Browse files

Merge

parents 0c280724 2c340f05
......@@ -393,6 +393,7 @@ inline const Node Node::operator[](const Node& key) const {
throw InvalidNode();
EnsureNodeExists();
key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value =
static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory);
......@@ -403,6 +404,7 @@ inline Node Node::operator[](const Node& key) {
throw InvalidNode();
EnsureNodeExists();
key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory);
}
......
......@@ -261,6 +261,17 @@ TEST(NodeTest, CloneNull) {
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) {
Node node;
EXPECT_EQ(EmitterStyle::Default, node.Style());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment