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

Fixed new API node key/value insertion in NodeBuilder (it was using the wrong condition on when it had added a key already)

Browse Source
This commit is contained in:
beder
2011-09-12 13:25:41 -05:00
parent ad95934844
commit b8cc21eb3c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/node/nodebuilder.cpp
View File

@@ -86,7 +86,7 @@ namespace YAML
RegisterAnchor(anchor, node); RegisterAnchor(anchor, node);
if(needsKey) if(needsKey)
m_keys.push_back(&node); m_keys.push_back(Key(&node, false));
return node; return node;
} }
@@ -108,10 +108,12 @@ namespace YAML
if(collection.type() == NodeType::Sequence) { if(collection.type() == NodeType::Sequence) {
collection.append(node, m_pMemory); collection.append(node, m_pMemory);
} else if(collection.type() == NodeType::Map) { } else if(collection.type() == NodeType::Map) {
detail::node& key = *m_keys.back(); Key& key = m_keys.back();
if(&key != &node) { if(key.second) {
collection.insert(*key.first, node, m_pMemory);
m_keys.pop_back(); m_keys.pop_back();
collection.insert(key, node, m_pMemory); } else {
key.second = true;
} }
} else { } else {
assert(false); assert(false);

3
src/node/nodebuilder.h
View File

@@ -47,7 +47,8 @@ namespace YAML
Nodes m_stack; Nodes m_stack;
Nodes m_anchors; Nodes m_anchors;
Nodes m_keys; typedef std::pair<detail::node *, bool> Key;
std::vector<Key> m_keys;
std::size_t m_mapDepth; std::size_t m_mapDepth;
}; };
} }