External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle character types differently for conversions.

Browse Source
This commit is contained in:
Lenard Szolnoki 2017-07-04 00:18:45 +02:00
parent 4140f24678
commit be9390ef64
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ struct convert;
namespace YAML { namespace YAML {
namespace conversion { namespace conversion {
static const std::regex re_true("true|True|TRUE"); static const std::regex re_true("true|True|TRUE");
static const std::regex re_false("false|False|FALSE"); static const std::regex re_false("false|False|FALSE");
static const std::regex re_decimal("[-+]?[0-9]+"); static const std::regex re_decimal("[-+]?[0-9]+");
@ -42,6 +43,15 @@ static const std::regex re_float(
"[-+]?(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)([eE][-+]?[0-9]+)?"); "[-+]?(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)([eE][-+]?[0-9]+)?");
static const std::regex re_inf("[-+]?(\\.inf|\\.Inf|\\.INF)"); static const std::regex re_inf("[-+]?(\\.inf|\\.Inf|\\.INF)");
static const std::regex re_nan("\\.nan|\\.NaN|\\.NAN"); static const std::regex re_nan("\\.nan|\\.NaN|\\.NAN");
template <typename T>
struct is_character {
using value_type = bool;
static constexpr bool value =
(std::is_same<T, char>::value || std::is_same<T, wchar_t>::value ||
std::is_same<T, char16_t>::value || std::is_same<T, char32_t>::value);
using type = std::integral_constant<bool, value>;
};
} }
// Node // Node
@ -88,11 +98,30 @@ struct convert<_Null> {
} }
}; };
// signed integral // character types
template <typename type> template <typename type>
struct convert<type, struct convert<type, typename std::enable_if<
typename std::enable_if<std::is_integral<type>::value && conversion::is_character<type>::value>::type> {
std::is_signed<type>::value>::type> { static Node encode(const type& rhs) { return Node(std::string(1,rhs)); }
static bool decode(const Node& node, type& rhs) {
if (node.Type() != NodeType::Scalar)
return false;
const std::string& input = node.Scalar();
if (input.length() != 1) {
return false;
}
rhs = input[0];
return true;
}
};
// signed integral (sans char)
template <typename type>
struct convert<
type, typename std::enable_if<
std::is_integral<type>::value && std::is_signed<type>::value &&
!conversion::is_character<type>::value>::type> {
static Node encode(const type& rhs) { return Node(std::to_string(rhs)); } static Node encode(const type& rhs) { return Node(std::to_string(rhs)); }
static bool decode(const Node& node, type& rhs) { static bool decode(const Node& node, type& rhs) {
@ -130,11 +159,12 @@ struct convert<type,
} }
}; };
// unsigned integral // unsigned integral (sans char)
template <typename type> template <typename type>
struct convert<type, struct convert<
typename std::enable_if<std::is_integral<type>::value && type, typename std::enable_if<
std::is_unsigned<type>::value>::type> { std::is_integral<type>::value && std::is_unsigned<type>::value &&
!conversion::is_character<type>::value>::type> {
static Node encode(const type& rhs) { return Node(std::to_string(rhs)); } static Node encode(const type& rhs) { return Node(std::to_string(rhs)); }
static bool decode(const Node& node, type& rhs) { static bool decode(const Node& node, type& rhs) {