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

Added reading/writing std::vector

Browse Source
This commit is contained in:
beder
2011-09-11 23:14:52 -05:00
parent cf5695e320
commit 2a71e8868b
3 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/yaml-cpp/node/convert.h
View File

@@ -7,6 +7,7 @@
#include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/iterator.h"
#include <map>
#include <sstream>
@@ -19,10 +20,10 @@ namespace YAML
return Node(rhs);
}
static bool decode(const Node& value, std::string& rhs) {
if(value.Type() != NodeType::Scalar)
static bool decode(const Node& node, std::string& rhs) {
if(node.Type() != NodeType::Scalar)
return false;
rhs = value.scalar();
rhs = node.scalar();
return true;
}
};
@@ -36,10 +37,10 @@ namespace YAML
return Node(stream.str());\
}\
\
static bool decode(const Node& value, type& rhs) {\
if(value.Type() != NodeType::Scalar)\
static bool decode(const Node& node, type& rhs) {\
if(node.Type() != NodeType::Scalar)\
return false;\
std::stringstream stream(value.scalar());\
std::stringstream stream(node.scalar());\
stream >> rhs;\
return !!stream;\
}\
@@ -66,17 +67,37 @@ namespace YAML
template<typename K, typename V>
struct convert<std::map<K, V> > {
static Node encode(const std::map<K, V>& rhs) {
Node value(NodeType::Map);
Node node(NodeType::Map);
for(typename std::map<K, V>::const_iterator it=rhs.begin();it!=rhs.end();++it)
value[it->first] = it->second;
return value;
node[it->first] = it->second;
return node;
}
static bool decode(const Node& value, std::map<K, V>& rhs) {
static bool decode(const Node& node, std::map<K, V>& rhs) {
rhs.clear();
return false;
}
};
template<typename T>
struct convert<std::vector<T> > {
static Node encode(const std::vector<T>& rhs) {
Node node(NodeType::Sequence);
for(std::size_t i=0;i<rhs.size();i++)
node.append(rhs[i]);
return node;
}
static bool decode(const Node& node, std::vector<T>& rhs) {
if(node.Type() != NodeType::Sequence)
return false;
rhs.clear();
for(const_iterator it=node.begin();it!=node.end();++it)
rhs.push_back(it->as<T>());
return true;
}
};
}
#endif // NODE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

4
include/yaml-cpp/node/detail/iterator.h
View File

@@ -46,9 +46,9 @@ namespace YAML
value_type dereference() const {
const typename base_type::value_type& v = *this->base();
if(v.pNode)
return value_type(Value(*v, m_pMemory));
return value_type(Node(*v, m_pMemory));
if(v.first && v.second)
return value_type(Value(*v.first, m_pMemory), Value(*v.second, m_pMemory));
return value_type(Node(*v.first, m_pMemory), Node(*v.second, m_pMemory));
return value_type();
}

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

@@ -102,6 +102,36 @@ namespace Test
YAML_ASSERT(count == 1);
return true;
}
TEST SimpleSubkeys()
{
YAML::Node node;
node["device"]["udid"] = "12345";
node["device"]["name"] = "iPhone";
node["device"]["os"] = "4.0";
node["username"] = "monkey";
YAML_ASSERT(node["device"]["udid"].as<std::string>() == "12345");
YAML_ASSERT(node["device"]["name"].as<std::string>() == "iPhone");
YAML_ASSERT(node["device"]["os"].as<std::string>() == "4.0");
YAML_ASSERT(node["username"].as<std::string>() == "monkey");
return true;
}
TEST StdVector()
{
std::vector<int> primes;
primes.push_back(2);
primes.push_back(3);
primes.push_back(5);
primes.push_back(7);
primes.push_back(11);
primes.push_back(13);
YAML::Node node;
node["primes"] = primes;
YAML_ASSERT(node["primes"].as<std::vector<int> >() == primes);
return true;
}
}
void RunNodeTest(TEST (*test)(), const std::string& name, int& passed, int& total) {
@@ -133,6 +163,8 @@ namespace Test
RunNodeTest(&Node::SimpleMap, "simple map", passed, total);
RunNodeTest(&Node::MapWithUndefinedValues, "map with undefined values", passed, total);
RunNodeTest(&Node::MapIteratorWithUndefinedValues, "map iterator with undefined values", passed, total);
RunNodeTest(&Node::SimpleSubkeys, "simple subkey", passed, total);
RunNodeTest(&Node::StdVector, "std::vector", passed, total);
std::cout << "Node tests: " << passed << "/" << total << " passed\n";
return passed == total;