diff --git a/include/yaml-cpp/node/convert.h b/include/yaml-cpp/node/convert.h index 8ab9736..f78332a 100644 --- a/include/yaml-cpp/node/convert.h +++ b/include/yaml-cpp/node/convert.h @@ -149,7 +149,7 @@ namespace YAML static Node encode(const std::vector& rhs) { Node node(NodeType::Sequence); for(typename std::vector::const_iterator it=rhs.begin();it!=rhs.end();++it) - node.append(*it); + node.push_back(*it); return node; } @@ -170,7 +170,7 @@ namespace YAML static Node encode(const std::list& rhs) { Node node(NodeType::Sequence); for(typename std::list::const_iterator it=rhs.begin();it!=rhs.end();++it) - node.append(*it); + node.push_back(*it); return node; } diff --git a/include/yaml-cpp/node/detail/node.h b/include/yaml-cpp/node/detail/node.h index 8dc84ad..846e279 100644 --- a/include/yaml-cpp/node/detail/node.h +++ b/include/yaml-cpp/node/detail/node.h @@ -87,8 +87,8 @@ namespace YAML node_iterator end() { return m_pRef->end(); } // sequence - void append(node& node, shared_memory_holder pMemory) { - m_pRef->append(node, pMemory); + void push_back(node& node, shared_memory_holder pMemory) { + m_pRef->push_back(node, pMemory); node.add_dependency(*this); } void insert(node& key, node& value, shared_memory_holder pMemory) { diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h index bd951f1..c0be2b8 100644 --- a/include/yaml-cpp/node/detail/node_data.h +++ b/include/yaml-cpp/node/detail/node_data.h @@ -45,7 +45,7 @@ namespace YAML node_iterator end(); // sequence - void append(node& node, shared_memory_holder pMemory); + void push_back(node& node, shared_memory_holder pMemory); void insert(node& key, node& value, shared_memory_holder pMemory); // indexing diff --git a/include/yaml-cpp/node/detail/node_ref.h b/include/yaml-cpp/node/detail/node_ref.h index 5b39661..d1b06c5 100644 --- a/include/yaml-cpp/node/detail/node_ref.h +++ b/include/yaml-cpp/node/detail/node_ref.h @@ -44,7 +44,7 @@ namespace YAML node_iterator end() {return m_pData->end(); } // sequence - void append(node& node, shared_memory_holder pMemory) { m_pData->append(node, pMemory); } + void push_back(node& node, shared_memory_holder pMemory) { m_pData->push_back(node, pMemory); } void insert(node& key, node& value, shared_memory_holder pMemory) { m_pData->insert(key, value, pMemory); } // indexing diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h index b58b394..e5c1693 100644 --- a/include/yaml-cpp/node/impl.h +++ b/include/yaml-cpp/node/impl.h @@ -252,17 +252,17 @@ namespace YAML // sequence template - inline void Node::append(const T& rhs) + inline void Node::push_back(const T& rhs) { - append(Node(rhs)); + push_back(Node(rhs)); } - inline void Node::append(const Node& rhs) + inline void Node::push_back(const Node& rhs) { EnsureNodeExists(); rhs.EnsureNodeExists(); - m_pNode->append(*rhs.m_pNode, m_pMemory); + m_pNode->push_back(*rhs.m_pNode, m_pMemory); m_pMemory->merge(*rhs.m_pMemory); } diff --git a/include/yaml-cpp/node/node.h b/include/yaml-cpp/node/node.h index 9445624..fd4561d 100644 --- a/include/yaml-cpp/node/node.h +++ b/include/yaml-cpp/node/node.h @@ -64,8 +64,8 @@ namespace YAML iterator end(); // sequence - template void append(const T& rhs); - void append(const Node& rhs); + template void push_back(const T& rhs); + void push_back(const Node& rhs); // indexing template const Node operator[](const Key& key) const; diff --git a/src/node_data.cpp b/src/node_data.cpp index 2af9931..3bf6540 100644 --- a/src/node_data.cpp +++ b/src/node_data.cpp @@ -153,7 +153,7 @@ namespace YAML } // sequence - void node_data::append(node& node, shared_memory_holder /* pMemory */) + void node_data::push_back(node& node, shared_memory_holder /* pMemory */) { if(m_type == NodeType::Undefined || m_type == NodeType::Null) { m_type = NodeType::Sequence; @@ -161,7 +161,7 @@ namespace YAML } if(m_type != NodeType::Sequence) - throw std::runtime_error("Can't append to a non-sequence node"); + throw std::runtime_error("Can't push_back to a non-sequence node"); m_sequence.push_back(&node); } diff --git a/src/nodebuilder.cpp b/src/nodebuilder.cpp index e60ed3a..6735f73 100644 --- a/src/nodebuilder.cpp +++ b/src/nodebuilder.cpp @@ -112,7 +112,7 @@ namespace YAML detail::node& collection = *m_stack.back(); if(collection.type() == NodeType::Sequence) { - collection.append(node, m_pMemory); + collection.push_back(node, m_pMemory); } else if(collection.type() == NodeType::Map) { assert(!m_keys.empty()); PushedKey& key = m_keys.back(); diff --git a/test/new-api/nodetests.cpp b/test/new-api/nodetests.cpp index c4781b3..c74333f 100644 --- a/test/new-api/nodetests.cpp +++ b/test/new-api/nodetests.cpp @@ -40,9 +40,9 @@ namespace Test TEST SimpleAppendSequence() { YAML::Node node; - node.append(10); - node.append("foo"); - node.append("monkey"); + node.push_back(10); + node.push_back("foo"); + node.push_back("monkey"); YAML_ASSERT(node.IsSequence()); YAML_ASSERT(node.size() == 3); YAML_ASSERT(node[0].as() == 10);