mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 12:41:17 +00:00
Renamed append -> push_back (to play nice with STL algorithms
This commit is contained in:
@@ -149,7 +149,7 @@ namespace YAML
|
|||||||
static Node encode(const std::vector<T>& rhs) {
|
static Node encode(const std::vector<T>& rhs) {
|
||||||
Node node(NodeType::Sequence);
|
Node node(NodeType::Sequence);
|
||||||
for(typename std::vector<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
|
for(typename std::vector<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
|
||||||
node.append(*it);
|
node.push_back(*it);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +170,7 @@ namespace YAML
|
|||||||
static Node encode(const std::list<T>& rhs) {
|
static Node encode(const std::list<T>& rhs) {
|
||||||
Node node(NodeType::Sequence);
|
Node node(NodeType::Sequence);
|
||||||
for(typename std::list<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
|
for(typename std::list<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
|
||||||
node.append(*it);
|
node.push_back(*it);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -87,8 +87,8 @@ namespace YAML
|
|||||||
node_iterator end() { return m_pRef->end(); }
|
node_iterator end() { return m_pRef->end(); }
|
||||||
|
|
||||||
// sequence
|
// sequence
|
||||||
void append(node& node, shared_memory_holder pMemory) {
|
void push_back(node& node, shared_memory_holder pMemory) {
|
||||||
m_pRef->append(node, pMemory);
|
m_pRef->push_back(node, pMemory);
|
||||||
node.add_dependency(*this);
|
node.add_dependency(*this);
|
||||||
}
|
}
|
||||||
void insert(node& key, node& value, shared_memory_holder pMemory) {
|
void insert(node& key, node& value, shared_memory_holder pMemory) {
|
||||||
|
@@ -45,7 +45,7 @@ namespace YAML
|
|||||||
node_iterator end();
|
node_iterator end();
|
||||||
|
|
||||||
// sequence
|
// 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);
|
void insert(node& key, node& value, shared_memory_holder pMemory);
|
||||||
|
|
||||||
// indexing
|
// indexing
|
||||||
|
@@ -44,7 +44,7 @@ namespace YAML
|
|||||||
node_iterator end() {return m_pData->end(); }
|
node_iterator end() {return m_pData->end(); }
|
||||||
|
|
||||||
// sequence
|
// 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); }
|
void insert(node& key, node& value, shared_memory_holder pMemory) { m_pData->insert(key, value, pMemory); }
|
||||||
|
|
||||||
// indexing
|
// indexing
|
||||||
|
@@ -252,17 +252,17 @@ namespace YAML
|
|||||||
|
|
||||||
// sequence
|
// sequence
|
||||||
template<typename T>
|
template<typename T>
|
||||||
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();
|
EnsureNodeExists();
|
||||||
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);
|
m_pMemory->merge(*rhs.m_pMemory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -64,8 +64,8 @@ namespace YAML
|
|||||||
iterator end();
|
iterator end();
|
||||||
|
|
||||||
// sequence
|
// sequence
|
||||||
template<typename T> void append(const T& rhs);
|
template<typename T> void push_back(const T& rhs);
|
||||||
void append(const Node& rhs);
|
void push_back(const Node& rhs);
|
||||||
|
|
||||||
// indexing
|
// indexing
|
||||||
template<typename Key> const Node operator[](const Key& key) const;
|
template<typename Key> const Node operator[](const Key& key) const;
|
||||||
|
@@ -153,7 +153,7 @@ namespace YAML
|
|||||||
}
|
}
|
||||||
|
|
||||||
// sequence
|
// 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) {
|
if(m_type == NodeType::Undefined || m_type == NodeType::Null) {
|
||||||
m_type = NodeType::Sequence;
|
m_type = NodeType::Sequence;
|
||||||
@@ -161,7 +161,7 @@ namespace YAML
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(m_type != NodeType::Sequence)
|
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);
|
m_sequence.push_back(&node);
|
||||||
}
|
}
|
||||||
|
@@ -112,7 +112,7 @@ namespace YAML
|
|||||||
detail::node& collection = *m_stack.back();
|
detail::node& collection = *m_stack.back();
|
||||||
|
|
||||||
if(collection.type() == NodeType::Sequence) {
|
if(collection.type() == NodeType::Sequence) {
|
||||||
collection.append(node, m_pMemory);
|
collection.push_back(node, m_pMemory);
|
||||||
} else if(collection.type() == NodeType::Map) {
|
} else if(collection.type() == NodeType::Map) {
|
||||||
assert(!m_keys.empty());
|
assert(!m_keys.empty());
|
||||||
PushedKey& key = m_keys.back();
|
PushedKey& key = m_keys.back();
|
||||||
|
@@ -40,9 +40,9 @@ namespace Test
|
|||||||
TEST SimpleAppendSequence()
|
TEST SimpleAppendSequence()
|
||||||
{
|
{
|
||||||
YAML::Node node;
|
YAML::Node node;
|
||||||
node.append(10);
|
node.push_back(10);
|
||||||
node.append("foo");
|
node.push_back("foo");
|
||||||
node.append("monkey");
|
node.push_back("monkey");
|
||||||
YAML_ASSERT(node.IsSequence());
|
YAML_ASSERT(node.IsSequence());
|
||||||
YAML_ASSERT(node.size() == 3);
|
YAML_ASSERT(node.size() == 3);
|
||||||
YAML_ASSERT(node[0].as<int>() == 10);
|
YAML_ASSERT(node[0].as<int>() == 10);
|
||||||
|
Reference in New Issue
Block a user