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

Added back the streamable conversions

Browse Source
This commit is contained in:
Jesse Beder
2011-09-08 02:05:03 -05:00
parent 3d84f57008
commit 0e197b8723
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/yaml-cpp/value/convert.h
View File

@@ -25,6 +25,42 @@ namespace YAML
return true; return true;
} }
}; };
#define YAML_DEFINE_CONVERT_STREAMABLE(type)\
template<>\
struct convert<type> {\
static Value encode(const type& rhs) {\
std::stringstream stream;\
stream << rhs;\
return Value(stream.str());\
}\
\
static bool decode(const Value& value, type& rhs) {\
if(value.Type() != ValueType::Scalar)\
return false;\
std::stringstream stream(value.scalar());\
stream >> rhs;\
return !!stream;\
}\
}
YAML_DEFINE_CONVERT_STREAMABLE(int);
YAML_DEFINE_CONVERT_STREAMABLE(unsigned);
YAML_DEFINE_CONVERT_STREAMABLE(short);
YAML_DEFINE_CONVERT_STREAMABLE(unsigned short);
YAML_DEFINE_CONVERT_STREAMABLE(long);
YAML_DEFINE_CONVERT_STREAMABLE(unsigned long);
YAML_DEFINE_CONVERT_STREAMABLE(long long);
YAML_DEFINE_CONVERT_STREAMABLE(unsigned long long);
YAML_DEFINE_CONVERT_STREAMABLE(char);
YAML_DEFINE_CONVERT_STREAMABLE(unsigned char);
YAML_DEFINE_CONVERT_STREAMABLE(float);
YAML_DEFINE_CONVERT_STREAMABLE(double);
YAML_DEFINE_CONVERT_STREAMABLE(long double);
#undef YAML_DEFINE_CONVERT_STREAMABLE
} }
#endif // VALUE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

31
src/value/convert.cpp
View File

@@ -3,37 +3,6 @@
namespace YAML namespace YAML
{ {
//#define YAML_DEFINE_CONVERT_STREAMABLE(type)\
// template<> Value convert(const type& rhs) {\
// std::stringstream stream;\
// stream << rhs;\
// return Value(stream.str());\
// }\
// template<> bool convert(const Value& value, type& rhs) {\
// if(value.Type() != ValueType::Scalar)\
// return false;\
// std::stringstream stream(value.scalar());\
// stream >> rhs;\
// return !!stream;\
// }
//
// YAML_DEFINE_CONVERT_STREAMABLE(int)
// YAML_DEFINE_CONVERT_STREAMABLE(unsigned)
// YAML_DEFINE_CONVERT_STREAMABLE(short)
// YAML_DEFINE_CONVERT_STREAMABLE(unsigned short)
// YAML_DEFINE_CONVERT_STREAMABLE(long)
// YAML_DEFINE_CONVERT_STREAMABLE(unsigned long)
// YAML_DEFINE_CONVERT_STREAMABLE(long long)
// YAML_DEFINE_CONVERT_STREAMABLE(unsigned long long)
//
// YAML_DEFINE_CONVERT_STREAMABLE(char)
// YAML_DEFINE_CONVERT_STREAMABLE(unsigned char)
//
// YAML_DEFINE_CONVERT_STREAMABLE(float)
// YAML_DEFINE_CONVERT_STREAMABLE(double)
// YAML_DEFINE_CONVERT_STREAMABLE(long double)
//
//#undef YAML_DEFINE_CONVERT_STREAMABLE
// //
// template<typename K, typename V> // template<typename K, typename V>
// Value convert<std::map<K, V> >(const std::map<K, V>& rhs) { // Value convert<std::map<K, V> >(const std::map<K, V>& rhs) {

8
util/value.cpp
View File

@@ -7,10 +7,10 @@ int main()
std::cout << value["key"].as<std::string>() << "\n"; std::cout << value["key"].as<std::string>() << "\n";
value["key"]["key"] = "value"; value["key"]["key"] = "value";
std::cout << value["key"]["key"].as<std::string>() << "\n"; std::cout << value["key"]["key"].as<std::string>() << "\n";
// value[5] = "monkey"; value[5] = "monkey";
// std::cout << value[5].as<std::string>() << "\n"; std::cout << value[5].as<std::string>() << "\n";
// value["monkey"] = 5; value["monkey"] = 5;
// std::cout << value["monkey"].as<int>() << "\n"; std::cout << value["monkey"].as<int>() << "\n";
return 0; return 0;
} }