Skip to content

Commit

Permalink
Move throw out of include headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nekotekina
Nekotekina authored and Megamouse committed Aug 18, 2023
1 parent f732014 commit fa43655
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 19 deletions.
9 changes: 6 additions & 3 deletions include/yaml-cpp/node/detail/impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <type_traits>

namespace YAML {
[[noreturn]] void throw_bad_subscript(const YAML::Mark& mark);
namespace detail {
template <typename Key, typename Enable = void>
struct get_idx {
Expand Down Expand Up @@ -128,7 +129,7 @@ inline node* node_data::get(const Key& key,
return pNode;
return nullptr;
case NodeType::Scalar:
throw BadSubscript(m_mark, key);
throw_bad_subscript(m_mark);
}

auto it = std::find_if(m_map.begin(), m_map.end(), [&](const kv_pair m) {
Expand All @@ -154,7 +155,7 @@ inline node& node_data::get(const Key& key, shared_memory_holder pMemory) {
convert_to_map(pMemory);
break;
case NodeType::Scalar:
throw BadSubscript(m_mark, key);
throw_bad_subscript(m_mark);
}

auto it = std::find_if(m_map.begin(), m_map.end(), [&](const kv_pair m) {
Expand Down Expand Up @@ -200,6 +201,8 @@ inline bool node_data::remove(const Key& key, shared_memory_holder pMemory) {
return false;
}

[[nodiscard]] void throw_bad_insert();

// map
template <typename Key, typename Value>
inline void node_data::force_insert(const Key& key, const Value& value,
Expand All @@ -213,7 +216,7 @@ inline void node_data::force_insert(const Key& key, const Value& value,
convert_to_map(pMemory);
break;
case NodeType::Scalar:
throw BadInsert();
throw_bad_insert();
}

node& k = convert_to_node(key, pMemory);
Expand Down
34 changes: 18 additions & 16 deletions include/yaml-cpp/node/impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <string>

namespace YAML {
[[noreturn]] extern void throw_invalid_node(const std::string& key);
[[noreturn]] extern void throw_bad_conversion(const YAML::Mark& mark);
inline Node::Node()
: m_isValid(true), m_invalidKey{}, m_pMemory(nullptr), m_pNode(nullptr) {}

Expand Down Expand Up @@ -57,7 +59,7 @@ inline Node::~Node() = default;

inline void Node::EnsureNodeExists() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
if (!m_pNode) {
m_pMemory.reset(new detail::memory_holder);
m_pNode = &m_pMemory->create_node();
Expand All @@ -74,14 +76,14 @@ inline bool Node::IsDefined() const {

inline Mark Node::Mark() const {
if (!m_isValid) {
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
}
return m_pNode ? m_pNode->mark() : Mark::null_mark();
}

inline NodeType::value Node::Type() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return m_pNode ? m_pNode->type() : NodeType::Null;
}

Expand Down Expand Up @@ -125,12 +127,12 @@ struct as_if<T, void> {

T operator()() const {
if (!node.m_pNode)
throw TypedBadConversion<T>(node.Mark());
throw_bad_conversion(node.Mark()); // <T>

T t;
if (convert<T>::decode(node, t))
return t;
throw TypedBadConversion<T>(node.Mark());
throw_bad_conversion(node.Mark()); // <T>
}
};

Expand All @@ -143,7 +145,7 @@ struct as_if<std::string, void> {
if (node.Type() == NodeType::Null)
return "null";
if (node.Type() != NodeType::Scalar)
throw TypedBadConversion<std::string>(node.Mark());
throw_bad_conversion(node.Mark()); // <std::string>
return node.Scalar();
}
};
Expand All @@ -152,7 +154,7 @@ struct as_if<std::string, void> {
template <typename T>
inline T Node::as() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return as_if<T, void>(*this)();
}

Expand All @@ -165,13 +167,13 @@ inline T Node::as(const S& fallback) const {

inline const std::string& Node::Scalar() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
}

inline const std::string& Node::Tag() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
}

Expand All @@ -182,7 +184,7 @@ inline void Node::SetTag(const std::string& tag) {

inline EmitterStyle::value Node::Style() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return m_pNode ? m_pNode->style() : EmitterStyle::Default;
}

Expand All @@ -194,7 +196,7 @@ inline void Node::SetStyle(EmitterStyle::value style) {
// assignment
inline bool Node::is(const Node& rhs) const {
if (!m_isValid || !rhs.m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
if (!m_pNode || !rhs.m_pNode)
return false;
return m_pNode->is(*rhs.m_pNode);
Expand All @@ -215,15 +217,15 @@ inline Node& Node::operator=(const Node& rhs) {

inline void Node::reset(const YAML::Node& rhs) {
if (!m_isValid || !rhs.m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
m_pMemory = rhs.m_pMemory;
m_pNode = rhs.m_pNode;
}

template <typename T>
inline void Node::Assign(const T& rhs) {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
AssignData(convert<T>::encode(rhs));
}

Expand Down Expand Up @@ -253,7 +255,7 @@ inline void Node::AssignData(const Node& rhs) {

inline void Node::AssignNode(const Node& rhs) {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
rhs.EnsureNodeExists();

if (!m_pNode) {
Expand All @@ -270,7 +272,7 @@ inline void Node::AssignNode(const Node& rhs) {
// size/iterator
inline std::size_t Node::size() const {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
return m_pNode ? m_pNode->size() : 0;
}

Expand Down Expand Up @@ -303,7 +305,7 @@ inline iterator Node::end() {
template <typename T>
inline void Node::push_back(const T& rhs) {
if (!m_isValid)
throw InvalidNode(m_invalidKey);
throw_invalid_node(m_invalidKey);
push_back(Node(rhs));
}

Expand Down
20 changes: 20 additions & 0 deletions src/exceptions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,24 @@ BadPushback::~BadPushback() YAML_CPP_NOEXCEPT = default;
BadInsert::~BadInsert() YAML_CPP_NOEXCEPT = default;
EmitterException::~EmitterException() YAML_CPP_NOEXCEPT = default;
BadFile::~BadFile() YAML_CPP_NOEXCEPT = default;

[[noreturn]] void throw_bad_subscript(const YAML::Mark& mark)
{
throw BadSubscript(mark, std::string{});
}

[[noreturn]] void throw_invalid_node(const std::string& key)
{
throw InvalidNode(key);
}

[[noreturn]] void throw_bad_conversion(const YAML::Mark& mark)
{
throw BadConversion(mark);
}

[[noreturn]] void throw_bad_insert()
{
throw BadInsert();
}
} // namespace YAML

0 comments on commit fa43655

Please sign in to comment.