Allow decoding types without a default constructor
`YAML::decode_dispatcher<T>::dispatch` is used for decoding `YAML::Node`
to a type T when compiled with C++17 or newer. This is a backward
compatible change as the default library implementation calls
`YAML::convert<T>::decode`.
An example:
```cpp
struct Vec3 {
double x, y, z;
Vec3(double x, double y, double z) : x(x), y(y), z(z) {}
// ...
};
namespace YAML {
template<>
struct decode_dispatcher<Vec3> {
static std::optional<Vec3> dispatch(const Node& node) {
if(!node.IsSequence() || node.size() != 3)
return std::nullopt;
return Vec3(
node[0].as<double>(),
node[1].as<double>(),
node[2].as<double>()
);
}
};
}
```
This commit is contained in:
parent
b591d8ae2a
commit
8eef18882e
@ -15,6 +15,11 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
|
||||||
|
#include <optional>
|
||||||
|
#define YAML_CPP_HAS_DECODE_DISPATCHER
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace YAML {
|
namespace YAML {
|
||||||
inline Node::Node()
|
inline Node::Node()
|
||||||
: m_isValid(true), m_invalidKey{}, m_pMemory(nullptr), m_pNode(nullptr) {}
|
: m_isValid(true), m_invalidKey{}, m_pMemory(nullptr), m_pNode(nullptr) {}
|
||||||
@ -88,6 +93,18 @@ inline NodeType::value Node::Type() const {
|
|||||||
// access
|
// access
|
||||||
|
|
||||||
// template helpers
|
// template helpers
|
||||||
|
#ifdef YAML_CPP_HAS_DECODE_DISPATCHER
|
||||||
|
template <typename T, typename Enable = void>
|
||||||
|
struct decode_dispatcher {
|
||||||
|
static std::optional<T> dispatch(const Node& node) {
|
||||||
|
T t;
|
||||||
|
if (convert<T>::decode(node, t))
|
||||||
|
return {t};
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
template <typename T, typename S>
|
template <typename T, typename S>
|
||||||
struct as_if {
|
struct as_if {
|
||||||
explicit as_if(const Node& node_) : node(node_) {}
|
explicit as_if(const Node& node_) : node(node_) {}
|
||||||
@ -97,10 +114,14 @@ struct as_if {
|
|||||||
if (!node.m_pNode)
|
if (!node.m_pNode)
|
||||||
return fallback;
|
return fallback;
|
||||||
|
|
||||||
|
#ifdef YAML_CPP_HAS_DECODE_DISPATCHER
|
||||||
|
return decode_dispatcher<T>::dispatch(node).value_or(fallback);
|
||||||
|
#else
|
||||||
T t;
|
T t;
|
||||||
if (convert<T>::decode(node, t))
|
if (convert<T>::decode(node, t))
|
||||||
return t;
|
return t;
|
||||||
return fallback;
|
return fallback;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -127,9 +148,15 @@ struct as_if<T, void> {
|
|||||||
if (!node.m_pNode)
|
if (!node.m_pNode)
|
||||||
throw TypedBadConversion<T>(node.Mark());
|
throw TypedBadConversion<T>(node.Mark());
|
||||||
|
|
||||||
|
#ifdef YAML_CPP_HAS_DECODE_DISPATCHER
|
||||||
|
auto t = decode_dispatcher<T>::dispatch(node);
|
||||||
|
if (t)
|
||||||
|
return *t;
|
||||||
|
#else
|
||||||
T t;
|
T t;
|
||||||
if (convert<T>::decode(node, t))
|
if (convert<T>::decode(node, t))
|
||||||
return t;
|
return t;
|
||||||
|
#endif
|
||||||
throw TypedBadConversion<T>(node.Mark());
|
throw TypedBadConversion<T>(node.Mark());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user