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

More useful error messages.

Browse Source 
Applied the patch given in jbeder/yaml-cpp#200 with the correct code
style.
This commit is contained in:
Oliver Hamlet
2015-03-31 12:23:02 +01:00
parent 5de38a76b6
commit ec8aa4fa62
10 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/yaml-cpp/node/impl.h
View File

@@ -66,6 +66,13 @@ inline bool Node::IsDefined() const {
return m_pNode ? m_pNode->is_defined() : true;
}
inline Mark Node::Mark() const {
if (!m_isValid) {
throw InvalidNode();
}
return m_pNode ? m_pNode->mark() : Mark::null_mark();
}
inline NodeType::value Node::Type() const {
if (!m_isValid)
throw InvalidNode();
@@ -110,12 +117,12 @@ struct as_if<T, void> {
const T operator()() const {
if (!node.m_pNode)
throw TypedBadConversion<T>();
throw TypedBadConversion<T>(node.Mark());
T t;
if (convert<T>::decode(node, t))
return t;
throw TypedBadConversion<T>();
throw TypedBadConversion<T>(node.Mark());
}
};
@@ -126,7 +133,7 @@ struct as_if<std::string, void> {
const std::string operator()() const {
if (node.Type() != NodeType::Scalar)
throw TypedBadConversion<std::string>();
throw TypedBadConversion<std::string>(node.Mark());
return node.Scalar();
}
};