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

Implemented operator[] specialization, but only const (should the sequence be mutable?)

Browse Source
This commit is contained in:
Jesse Beder
2011-09-11 21:51:04 -05:00
parent 4568dd0b19
commit 4770ec798c
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/yaml-cpp/node/detail/impl.h
View File

@@ -8,29 +8,36 @@
#include "yaml-cpp/node/detail/node.h" #include "yaml-cpp/node/detail/node.h"
#include "yaml-cpp/node/detail/node_data.h" #include "yaml-cpp/node/detail/node_data.h"
#include <boost/type_traits.hpp>
namespace YAML namespace YAML
{ {
namespace detail namespace detail
{ {
template<typename Key, typename Enable = void> template<typename Key, typename Enable = void>
struct get_idx_helper { struct get_idx {
static node *get(const Key& /* key */, shared_memory_holder /* pMemory */) { static node *get(const std::vector<node *>& /* sequence */, const Key& /* key */, shared_memory_holder /* pMemory */) {
return 0; return 0;
} }
}; };
template<typename Key> template<typename Key>
struct get_idx_helper<Key, typename boost::enable_if<boost::is_integral<Key> >::type> { struct get_idx<Key, typename boost::enable_if<boost::is_unsigned<Key> >::type> {
static node *get(const Key& key, shared_memory_holder pMemory) { static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
if(key < sequence.size())
return sequence[key];
return 0; return 0;
} }
}; };
template<typename Key> template<typename Key>
inline node *get_idx(const Key& key, shared_memory_holder pMemory) { struct get_idx<Key, typename boost::enable_if<boost::is_signed<Key> >::type> {
return get_idx_helper<Key>::get(key, pMemory); static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
} if(key < 0)
return 0;
return get_idx<std::size_t>::get(sequence, static_cast<std::size_t>(key), pMemory);
}
};
// indexing // indexing
template<typename Key> template<typename Key>
@@ -43,7 +50,7 @@ namespace YAML
case NodeType::Null: case NodeType::Null:
return pMemory->create_node(); return pMemory->create_node();
case NodeType::Sequence: case NodeType::Sequence:
if(node *pNode = get_idx(key, pMemory)) if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory))
return *pNode; return *pNode;
return pMemory->create_node(); return pMemory->create_node();
case NodeType::Scalar: case NodeType::Scalar:
@@ -67,7 +74,7 @@ namespace YAML
case NodeType::Undefined: case NodeType::Undefined:
case NodeType::Null: case NodeType::Null:
case NodeType::Sequence: case NodeType::Sequence:
if(node *pNode = get_idx(key, pMemory)) if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory))
return *pNode; return *pNode;
convert_to_map(pMemory); convert_to_map(pMemory);

20
test/new-api/nodetests.cpp
View File

@@ -34,7 +34,7 @@ namespace Test
return true; return true;
} }
TEST SimpleSequence() TEST SimpleAppendSequence()
{ {
YAML::Node node; YAML::Node node;
node.append(10); node.append(10);
@@ -49,6 +49,21 @@ namespace Test
return true; return true;
} }
TEST SimpleAssignSequence()
{
YAML::Node node;
node[0] = 10;
node[1] = "foo";
node[2] = "monkey";
YAML_ASSERT(node.Type() == YAML::NodeType::Sequence);
YAML_ASSERT(node.size() == 3);
YAML_ASSERT(node[0].as<int>() == 10);
YAML_ASSERT(node[1].as<std::string>() == "foo");
YAML_ASSERT(node[2].as<std::string>() == "monkey");
YAML_ASSERT(node.Type() == YAML::NodeType::Sequence);
return true;
}
TEST SimpleMap() TEST SimpleMap()
{ {
YAML::Node node; YAML::Node node;
@@ -113,7 +128,8 @@ namespace Test
RunNodeTest(&Node::SimpleScalar, "simple scalar", passed, total); RunNodeTest(&Node::SimpleScalar, "simple scalar", passed, total);
RunNodeTest(&Node::IntScalar, "int scalar", passed, total); RunNodeTest(&Node::IntScalar, "int scalar", passed, total);
RunNodeTest(&Node::SimpleSequence, "simple sequence", passed, total); RunNodeTest(&Node::SimpleAppendSequence, "simple append sequence", passed, total);
RunNodeTest(&Node::SimpleAssignSequence, "simple assign sequence", passed, total);
RunNodeTest(&Node::SimpleMap, "simple map", passed, total); RunNodeTest(&Node::SimpleMap, "simple map", passed, total);
RunNodeTest(&Node::MapWithUndefinedValues, "map with undefined values", passed, total); RunNodeTest(&Node::MapWithUndefinedValues, "map with undefined values", passed, total);
RunNodeTest(&Node::MapIteratorWithUndefinedValues, "map iterator with undefined values", passed, total); RunNodeTest(&Node::MapIteratorWithUndefinedValues, "map iterator with undefined values", passed, total);