Skip to content

Y
yaml-cpp
Commit d63ec48c by Jesse Beder
Options

Run clang-format

parent 3355bbb3
Showing with 1519 additions and 1466 deletions
include/yaml-cpp/dll.h
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
// #pragma message( "Defining YAML_CPP_API for DLL import" ) // #pragma message( "Defining YAML_CPP_API for DLL import" )
#define YAML_CPP_API __declspec(dllimport) #define YAML_CPP_API __declspec(dllimport)
#endif // yaml_cpp_EXPORTS #endif // yaml_cpp_EXPORTS
#else // YAML_CPP_DLL #else // YAML_CPP_DLL
#define YAML_CPP_API #define YAML_CPP_API
#endif // YAML_CPP_DLL #endif // YAML_CPP_DLL
......
include/yaml-cpp/node/detail/bool_type.h
#ifndef NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
namespace YAML namespace YAML {
{ namespace detail {
namespace detail struct unspecified_bool {
{ struct NOT_ALLOWED;
struct unspecified_bool { static void true_value(NOT_ALLOWED*) {}
struct NOT_ALLOWED; };
static void true_value(NOT_ALLOWED*) {} typedef void (*unspecified_bool_type)(unspecified_bool::NOT_ALLOWED*);
};
typedef void (*unspecified_bool_type)(unspecified_bool::NOT_ALLOWED*);
}
} }
#define YAML_CPP_OPERATOR_BOOL()\
operator YAML::detail::unspecified_bool_type() const\
{\
return this->operator!() ? 0 : &YAML::detail::unspecified_bool::true_value;\
} }
#endif // NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define YAML_CPP_OPERATOR_BOOL() \
operator YAML::detail::unspecified_bool_type() const { \
return this->operator!() ? 0 \
: &YAML::detail::unspecified_bool::true_value; \
}
#endif // NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/impl.h
#ifndef NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/node/detail/node.h" #include "yaml-cpp/node/detail/node.h"
#include "yaml-cpp/node/detail/node_data.h" #include "yaml-cpp/node/detail/node_data.h"
#include <boost/type_traits.hpp> #include <boost/type_traits.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail template <typename Key, typename Enable = void>
{ struct get_idx {
template<typename Key, typename Enable = void> static node* get(const std::vector<node*>& /* sequence */,
struct get_idx { const Key& /* key */, shared_memory_holder /* pMemory */) {
static node *get(const std::vector<node *>& /* sequence */, const Key& /* key */, shared_memory_holder /* pMemory */) { return 0;
return 0; }
} };
};
template <typename Key>
template<typename Key> struct get_idx<
struct get_idx<Key, typename boost::enable_if_c<boost::is_unsigned<Key>::value && !boost::is_same<Key, bool>::value>::type> { Key, typename boost::enable_if_c<boost::is_unsigned<Key>::value &&
static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder /* pMemory */) { !boost::is_same<Key, bool>::value>::type> {
return key < sequence.size() ? sequence[key] : 0; static node* get(const std::vector<node*>& sequence, const Key& key,
} shared_memory_holder /* pMemory */) {
return key < sequence.size() ? sequence[key] : 0;
static node *get(std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) { }
if(key > sequence.size())
return 0; static node* get(std::vector<node*>& sequence, const Key& key,
if(key == sequence.size()) shared_memory_holder pMemory) {
sequence.push_back(&pMemory->create_node()); if (key > sequence.size())
return sequence[key]; return 0;
} if (key == sequence.size())
}; sequence.push_back(&pMemory->create_node());
return sequence[key];
template<typename Key> }
struct get_idx<Key, typename boost::enable_if<boost::is_signed<Key> >::type> { };
static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
return key >= 0 ? get_idx<std::size_t>::get(sequence, static_cast<std::size_t>(key), pMemory) : 0; template <typename Key>
} struct get_idx<Key, typename boost::enable_if<boost::is_signed<Key> >::type> {
static node *get(std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) { static node* get(const std::vector<node*>& sequence, const Key& key,
return key >= 0 ? get_idx<std::size_t>::get(sequence, static_cast<std::size_t>(key), pMemory) : 0; shared_memory_holder pMemory) {
} return key >= 0 ? get_idx<std::size_t>::get(
}; sequence, static_cast<std::size_t>(key), pMemory)
: 0;
// indexing }
template<typename Key> static node* get(std::vector<node*>& sequence, const Key& key,
inline node& node_data::get(const Key& key, shared_memory_holder pMemory) const shared_memory_holder pMemory) {
{ return key >= 0 ? get_idx<std::size_t>::get(
switch(m_type) { sequence, static_cast<std::size_t>(key), pMemory)
case NodeType::Map: : 0;
break; }
case NodeType::Undefined: };
case NodeType::Null:
return pMemory->create_node(); // indexing
case NodeType::Sequence: template <typename Key>
if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory)) inline node& node_data::get(const Key& key,
return *pNode; shared_memory_holder pMemory) const {
return pMemory->create_node(); switch (m_type) {
case NodeType::Scalar: case NodeType::Map:
throw BadSubscript(); break;
} case NodeType::Undefined:
case NodeType::Null:
for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) { return pMemory->create_node();
if(equals(*it->first, key, pMemory)) case NodeType::Sequence:
return *it->second; if (node* pNode = get_idx<Key>::get(m_sequence, key, pMemory))
} return *pNode;
return pMemory->create_node();
return pMemory->create_node(); case NodeType::Scalar:
} throw BadSubscript();
}
template<typename Key>
inline node& node_data::get(const Key& key, shared_memory_holder pMemory) for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
{ if (equals(*it->first, key, pMemory))
switch(m_type) { return *it->second;
case NodeType::Map: }
break;
case NodeType::Undefined: return pMemory->create_node();
case NodeType::Null: }
case NodeType::Sequence:
if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory)) { template <typename Key>
m_type = NodeType::Sequence; inline node& node_data::get(const Key& key, shared_memory_holder pMemory) {
return *pNode; switch (m_type) {
} case NodeType::Map:
break;
convert_to_map(pMemory); case NodeType::Undefined:
break; case NodeType::Null:
case NodeType::Scalar: case NodeType::Sequence:
throw BadSubscript(); if (node* pNode = get_idx<Key>::get(m_sequence, key, pMemory)) {
} m_type = NodeType::Sequence;
return *pNode;
for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) { }
if(equals(*it->first, key, pMemory))
return *it->second; convert_to_map(pMemory);
} break;
case NodeType::Scalar:
node& k = convert_to_node(key, pMemory); throw BadSubscript();
node& v = pMemory->create_node(); }
insert_map_pair(k, v);
return v; for (node_map::const_iterator it = m_map.begin(); it != m_map.end(); ++it) {
} if (equals(*it->first, key, pMemory))
return *it->second;
template<typename Key> }
inline bool node_data::remove(const Key& key, shared_memory_holder pMemory)
{ node& k = convert_to_node(key, pMemory);
if(m_type != NodeType::Map) node& v = pMemory->create_node();
return false; insert_map_pair(k, v);
return v;
for(node_map::iterator it=m_map.begin();it!=m_map.end();++it) { }
if(equals(*it->first, key, pMemory)) {
m_map.erase(it); template <typename Key>
return true; inline bool node_data::remove(const Key& key, shared_memory_holder pMemory) {
} if (m_type != NodeType::Map)
} return false;
return false; for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
} if (equals(*it->first, key, pMemory)) {
m_map.erase(it);
// map return true;
template<typename Key, typename Value> }
inline void node_data::force_insert(const Key& key, const Value& value, shared_memory_holder pMemory) }
{
switch(m_type) { return false;
case NodeType::Map: }
break;
case NodeType::Undefined: // map
case NodeType::Null: template <typename Key, typename Value>
case NodeType::Sequence: inline void node_data::force_insert(const Key& key, const Value& value,
convert_to_map(pMemory); shared_memory_holder pMemory) {
break; switch (m_type) {
case NodeType::Scalar: case NodeType::Map:
throw BadInsert(); break;
} case NodeType::Undefined:
case NodeType::Null:
node& k = convert_to_node(key, pMemory); case NodeType::Sequence:
node& v = convert_to_node(value, pMemory); convert_to_map(pMemory);
insert_map_pair(k, v); break;
} case NodeType::Scalar:
throw BadInsert();
template<typename T> }
inline bool node_data::equals(node& node, const T& rhs, shared_memory_holder pMemory)
{ node& k = convert_to_node(key, pMemory);
T lhs; node& v = convert_to_node(value, pMemory);
if(convert<T>::decode(Node(node, pMemory), lhs)) insert_map_pair(k, v);
return lhs == rhs; }
return false;
} template <typename T>
inline bool node_data::equals(node& node, const T& rhs,
inline bool node_data::equals(node& node, const char *rhs, shared_memory_holder pMemory) shared_memory_holder pMemory) {
{ T lhs;
return equals<std::string>(node, rhs, pMemory); if (convert<T>::decode(Node(node, pMemory), lhs))
} return lhs == rhs;
return false;
template<typename T> }
inline node& node_data::convert_to_node(const T& rhs, shared_memory_holder pMemory)
{ inline bool node_data::equals(node& node, const char* rhs,
Node value = convert<T>::encode(rhs); shared_memory_holder pMemory) {
value.EnsureNodeExists(); return equals<std::string>(node, rhs, pMemory);
pMemory->merge(*value.m_pMemory); }
return *value.m_pNode;
} template <typename T>
} inline node& node_data::convert_to_node(const T& rhs,
shared_memory_holder pMemory) {
Node value = convert<T>::encode(rhs);
value.EnsureNodeExists();
pMemory->merge(*value.m_pMemory);
return *value.m_pNode;
}
}
} }
#endif // NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/iterator.h
#ifndef VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_iterator.h" #include "yaml-cpp/node/detail/node_iterator.h"
#include <boost/iterator/iterator_adaptor.hpp> #include <boost/iterator/iterator_adaptor.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail struct iterator_value;
{
struct iterator_value; template <typename V>
class iterator_base
: public boost::iterator_adaptor<iterator_base<V>, node_iterator, V,
std::forward_iterator_tag, V> {
private:
template <typename>
friend class iterator_base;
struct enabler {};
typedef typename iterator_base::base_type base_type;
public:
typedef typename iterator_base::value_type value_type;
public:
iterator_base() {}
explicit iterator_base(base_type rhs, shared_memory_holder pMemory)
: iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {}
template<typename V> template <class W>
class iterator_base: public boost::iterator_adaptor< iterator_base(
iterator_base<V>, const iterator_base<W>& rhs,
node_iterator, typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type =
V, enabler())
std::forward_iterator_tag, : iterator_base::iterator_adaptor_(rhs.base()),
V> m_pMemory(rhs.m_pMemory) {}
{
private:
template<typename> friend class iterator_base;
struct enabler {};
typedef typename iterator_base::base_type base_type;
public:
typedef typename iterator_base::value_type value_type;
public:
iterator_base() {}
explicit iterator_base(base_type rhs, shared_memory_holder pMemory): iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {}
template<class W>
iterator_base(const iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler()): iterator_base::iterator_adaptor_(rhs.base()), m_pMemory(rhs.m_pMemory) {}
private:
friend class boost::iterator_core_access;
void increment() { this->base_reference() = boost::next(this->base()); } private:
friend class boost::iterator_core_access;
value_type dereference() const {
const typename base_type::value_type& v = *this->base(); void increment() { this->base_reference() = boost::next(this->base()); }
if(v.pNode)
return value_type(Node(*v, m_pMemory)); value_type dereference() const {
if(v.first && v.second) const typename base_type::value_type& v = *this->base();
return value_type(Node(*v.first, m_pMemory), Node(*v.second, m_pMemory)); if (v.pNode)
return value_type(); return value_type(Node(*v, m_pMemory));
} if (v.first && v.second)
return value_type(Node(*v.first, m_pMemory), Node(*v.second, m_pMemory));
private: return value_type();
shared_memory_holder m_pMemory; }
};
} private:
shared_memory_holder m_pMemory;
};
}
} }
#endif // VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/iterator_fwd.h
#ifndef VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include <list> #include <list>
#include <utility> #include <utility>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ class node;
class node;
namespace detail {
namespace detail { struct iterator_value;
struct iterator_value; template <typename V>
template<typename V> class iterator_base; class iterator_base;
} }
typedef detail::iterator_base<detail::iterator_value> iterator; typedef detail::iterator_base<detail::iterator_value> iterator;
typedef detail::iterator_base<const detail::iterator_value> const_iterator; typedef detail::iterator_base<const detail::iterator_value> const_iterator;
} }
#endif // VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/memory.h
#ifndef VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
...@@ -9,31 +11,29 @@ ...@@ -9,31 +11,29 @@
#include <set> #include <set>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail class memory {
{ public:
class memory { node& create_node();
public: void merge(const memory& rhs);
node& create_node();
void merge(const memory& rhs); private:
typedef std::set<shared_node> Nodes;
private: Nodes m_nodes;
typedef std::set<shared_node> Nodes; };
Nodes m_nodes;
}; class memory_holder {
public:
class memory_holder { memory_holder() : m_pMemory(new memory) {}
public:
memory_holder(): m_pMemory(new memory) {} node& create_node() { return m_pMemory->create_node(); }
void merge(memory_holder& rhs);
node& create_node() { return m_pMemory->create_node(); }
void merge(memory_holder& rhs); private:
boost::shared_ptr<memory> m_pMemory;
private: };
boost::shared_ptr<memory> m_pMemory; }
};
}
} }
#endif // VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/node.h
#ifndef NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/type.h" #include "yaml-cpp/node/type.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
...@@ -13,118 +14,134 @@ ...@@ -13,118 +14,134 @@
#include <set> #include <set>
#include <boost/utility.hpp> #include <boost/utility.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail class node : private boost::noncopyable {
{ public:
class node: private boost::noncopyable node() : m_pRef(new node_ref) {}
{
public: bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; }
node(): m_pRef(new node_ref) {} const node_ref* ref() const { return m_pRef.get(); }
bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; } bool is_defined() const { return m_pRef->is_defined(); }
const node_ref *ref() const { return m_pRef.get(); } NodeType::value type() const { return m_pRef->type(); }
bool is_defined() const { return m_pRef->is_defined(); } const std::string& scalar() const { return m_pRef->scalar(); }
NodeType::value type() const { return m_pRef->type(); } const std::string& tag() const { return m_pRef->tag(); }
const std::string& scalar() const { return m_pRef->scalar(); } void mark_defined() {
const std::string& tag() const { return m_pRef->tag(); } if (is_defined())
return;
void mark_defined() {
if(is_defined()) m_pRef->mark_defined();
return; for (nodes::iterator it = m_dependencies.begin();
it != m_dependencies.end(); ++it)
m_pRef->mark_defined(); (*it)->mark_defined();
for(nodes::iterator it=m_dependencies.begin();it!=m_dependencies.end();++it) m_dependencies.clear();
(*it)->mark_defined(); }
m_dependencies.clear();
} void add_dependency(node& rhs) {
if (is_defined())
void add_dependency(node& rhs) { rhs.mark_defined();
if(is_defined()) else
rhs.mark_defined(); m_dependencies.insert(&rhs);
else }
m_dependencies.insert(&rhs);
} void set_ref(const node& rhs) {
if (rhs.is_defined())
void set_ref(const node& rhs) { mark_defined();
if(rhs.is_defined()) m_pRef = rhs.m_pRef;
mark_defined(); }
m_pRef = rhs.m_pRef; void set_data(const node& rhs) {
} if (rhs.is_defined())
void set_data(const node& rhs) { mark_defined();
if(rhs.is_defined()) m_pRef->set_data(*rhs.m_pRef);
mark_defined(); }
m_pRef->set_data(*rhs.m_pRef);
} void set_type(NodeType::value type) {
if (type != NodeType::Undefined)
void set_type(NodeType::value type) { mark_defined();
if(type != NodeType::Undefined) m_pRef->set_type(type);
mark_defined(); }
m_pRef->set_type(type); void set_null() {
} mark_defined();
void set_null() { m_pRef->set_null();
mark_defined(); }
m_pRef->set_null(); void set_scalar(const std::string& scalar) {
} mark_defined();
void set_scalar(const std::string& scalar) { m_pRef->set_scalar(scalar);
mark_defined(); }
m_pRef->set_scalar(scalar); void set_tag(const std::string& tag) {
} mark_defined();
void set_tag(const std::string& tag) { m_pRef->set_tag(tag);
mark_defined(); }
m_pRef->set_tag(tag);
} // size/iterator
std::size_t size() const { return m_pRef->size(); }
// size/iterator
std::size_t size() const { return m_pRef->size(); } const_node_iterator begin() const {
return static_cast<const node_ref&>(*m_pRef).begin();
const_node_iterator begin() const { return static_cast<const node_ref&>(*m_pRef).begin(); } }
node_iterator begin() { return m_pRef->begin(); } node_iterator begin() { return m_pRef->begin(); }
const_node_iterator end() const { return static_cast<const node_ref&>(*m_pRef).end(); } const_node_iterator end() const {
node_iterator end() { return m_pRef->end(); } return static_cast<const node_ref&>(*m_pRef).end();
}
// sequence node_iterator end() { return m_pRef->end(); }
void push_back(node& node, shared_memory_holder pMemory) {
m_pRef->push_back(node, pMemory); // sequence
node.add_dependency(*this); void push_back(node& node, shared_memory_holder pMemory) {
} m_pRef->push_back(node, pMemory);
void insert(node& key, node& value, shared_memory_holder pMemory) { node.add_dependency(*this);
m_pRef->insert(key, value, pMemory); }
key.add_dependency(*this); void insert(node& key, node& value, shared_memory_holder pMemory) {
value.add_dependency(*this); m_pRef->insert(key, value, pMemory);
} key.add_dependency(*this);
value.add_dependency(*this);
// indexing }
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const { return static_cast<const node_ref&>(*m_pRef).get(key, pMemory); }
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) { // indexing
node& value = m_pRef->get(key, pMemory); template <typename Key>
value.add_dependency(*this); node& get(const Key& key, shared_memory_holder pMemory) const {
return value; return static_cast<const node_ref&>(*m_pRef).get(key, pMemory);
} }
template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory) { return m_pRef->remove(key, pMemory); } template <typename Key>
node& get(const Key& key, shared_memory_holder pMemory) {
node& get(node& key, shared_memory_holder pMemory) const { return static_cast<const node_ref&>(*m_pRef).get(key, pMemory); } node& value = m_pRef->get(key, pMemory);
node& get(node& key, shared_memory_holder pMemory) { value.add_dependency(*this);
node& value = m_pRef->get(key, pMemory); return value;
key.add_dependency(*this); }
value.add_dependency(*this); template <typename Key>
return value; bool remove(const Key& key, shared_memory_holder pMemory) {
} return m_pRef->remove(key, pMemory);
bool remove(node& key, shared_memory_holder pMemory) { return m_pRef->remove(key, pMemory); } }
// map node& get(node& key, shared_memory_holder pMemory) const {
template<typename Key, typename Value> return static_cast<const node_ref&>(*m_pRef).get(key, pMemory);
void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory){ m_pRef->force_insert(key, value, pMemory); } }
node& get(node& key, shared_memory_holder pMemory) {
private: node& value = m_pRef->get(key, pMemory);
shared_node_ref m_pRef; key.add_dependency(*this);
typedef std::set<node *> nodes; value.add_dependency(*this);
nodes m_dependencies; return value;
}; }
} bool remove(node& key, shared_memory_holder pMemory) {
return m_pRef->remove(key, pMemory);
}
// map
template <typename Key, typename Value>
void force_insert(const Key& key, const Value& value,
shared_memory_holder pMemory) {
m_pRef->force_insert(key, value, pMemory);
}
private:
shared_node_ref m_pRef;
typedef std::set<node*> nodes;
nodes m_dependencies;
};
}
} }
#endif // NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/node_data.h
#ifndef VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/iterator.h" #include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
...@@ -15,96 +16,99 @@ ...@@ -15,96 +16,99 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail class node_data : private boost::noncopyable {
{ public:
class node_data: private boost::noncopyable node_data();
{
public: void mark_defined();
node_data(); void set_type(NodeType::value type);
void set_tag(const std::string& tag);
void mark_defined(); void set_null();
void set_type(NodeType::value type); void set_scalar(const std::string& scalar);
void set_tag(const std::string& tag);
void set_null(); bool is_defined() const { return m_isDefined; }
void set_scalar(const std::string& scalar); NodeType::value type() const {
return m_isDefined ? m_type : NodeType::Undefined;
bool is_defined() const { return m_isDefined; } }
NodeType::value type() const { return m_isDefined ? m_type : NodeType::Undefined; } const std::string& scalar() const { return m_scalar; }
const std::string& scalar() const { return m_scalar; } const std::string& tag() const { return m_tag; }
const std::string& tag() const { return m_tag; }
// size/iterator
// size/iterator std::size_t size() const;
std::size_t size() const;
const_node_iterator begin() const;
const_node_iterator begin() const; node_iterator begin();
node_iterator begin();
const_node_iterator end() const;
const_node_iterator end() const; node_iterator end();
node_iterator end();
// sequence
// sequence void push_back(node& node, shared_memory_holder pMemory);
void push_back(node& node, shared_memory_holder pMemory); void insert(node& key, node& value, shared_memory_holder pMemory);
void insert(node& key, node& value, shared_memory_holder pMemory);
// indexing
// indexing template <typename Key>
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const; node& get(const Key& key, shared_memory_holder pMemory) const;
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory); template <typename Key>
template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory); node& get(const Key& key, shared_memory_holder pMemory);
template <typename Key>
node& get(node& key, shared_memory_holder pMemory) const; bool remove(const Key& key, shared_memory_holder pMemory);
node& get(node& key, shared_memory_holder pMemory);
bool remove(node& key, shared_memory_holder pMemory); node& get(node& key, shared_memory_holder pMemory) const;
node& get(node& key, shared_memory_holder pMemory);
// map bool remove(node& key, shared_memory_holder pMemory);
template<typename Key, typename Value>
void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory); // map
template <typename Key, typename Value>
public: void force_insert(const Key& key, const Value& value,
static std::string empty_scalar; shared_memory_holder pMemory);
private: public:
void compute_seq_size() const; static std::string empty_scalar;
void compute_map_size() const;
private:
void reset_sequence(); void compute_seq_size() const;
void reset_map(); void compute_map_size() const;
void insert_map_pair(node& key, node& value); void reset_sequence();
void convert_to_map(shared_memory_holder pMemory); void reset_map();
void convert_sequence_to_map(shared_memory_holder pMemory);
void insert_map_pair(node& key, node& value);
template<typename T> void convert_to_map(shared_memory_holder pMemory);
static bool equals(node& node, const T& rhs, shared_memory_holder pMemory); void convert_sequence_to_map(shared_memory_holder pMemory);
static bool equals(node& node, const char *rhs, shared_memory_holder pMemory);
template <typename T>
template<typename T> static bool equals(node& node, const T& rhs, shared_memory_holder pMemory);
static node& convert_to_node(const T& rhs, shared_memory_holder pMemory); static bool equals(node& node, const char* rhs, shared_memory_holder pMemory);
private: template <typename T>
bool m_isDefined; static node& convert_to_node(const T& rhs, shared_memory_holder pMemory);
NodeType::value m_type;
std::string m_tag; private:
bool m_isDefined;
// scalar NodeType::value m_type;
std::string m_scalar; std::string m_tag;
// sequence // scalar
typedef std::vector<node *> node_seq; std::string m_scalar;
node_seq m_sequence;
// sequence
mutable std::size_t m_seqSize; typedef std::vector<node*> node_seq;
node_seq m_sequence;
// map
typedef std::map<node *, node *> node_map; mutable std::size_t m_seqSize;
node_map m_map;
// map
typedef std::pair<node *, node *> kv_pair; typedef std::map<node*, node*> node_map;
typedef std::list<kv_pair> kv_pairs; node_map m_map;
mutable kv_pairs m_undefinedPairs;
}; typedef std::pair<node*, node*> kv_pair;
} typedef std::list<kv_pair> kv_pairs;
mutable kv_pairs m_undefinedPairs;
};
}
} }
#endif // VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/node_iterator.h
#ifndef VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
...@@ -14,126 +15,143 @@ ...@@ -14,126 +15,143 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail struct iterator_type {
{ enum value {
struct iterator_type { enum value { None, Sequence, Map }; }; None,
Sequence,
template<typename V> Map
struct node_iterator_value: public std::pair<V*, V*> { };
typedef std::pair<V*, V*> kv; };
node_iterator_value(): kv(), pNode(0) {} template <typename V>
explicit node_iterator_value(V& rhs): kv(), pNode(&rhs) {} struct node_iterator_value : public std::pair<V*, V*> {
explicit node_iterator_value(V& key, V& value): kv(&key, &value), pNode(0) {} typedef std::pair<V*, V*> kv;
V& operator *() const { return *pNode; } node_iterator_value() : kv(), pNode(0) {}
V& operator ->() const { return *pNode; } explicit node_iterator_value(V& rhs) : kv(), pNode(&rhs) {}
explicit node_iterator_value(V& key, V& value) : kv(&key, &value), pNode(0) {}
V *pNode;
}; V& operator*() const { return *pNode; }
V& operator->() const { return *pNode; }
typedef std::vector<node *> node_seq;
typedef std::map<node *, node *> node_map; V* pNode;
};
template<typename V>
struct node_iterator_type { typedef std::vector<node*> node_seq;
typedef node_seq::iterator seq; typedef std::map<node*, node*> node_map;
typedef node_map::iterator map;
}; template <typename V>
struct node_iterator_type {
template<typename V> typedef node_seq::iterator seq;
struct node_iterator_type<const V> { typedef node_map::iterator map;
typedef node_seq::const_iterator seq; };
typedef node_map::const_iterator map;
}; template <typename V>
struct node_iterator_type<const V> {
typedef node_seq::const_iterator seq;
template<typename V> typedef node_map::const_iterator map;
class node_iterator_base: public boost::iterator_facade< };
node_iterator_base<V>,
node_iterator_value<V>, template <typename V>
std::forward_iterator_tag, class node_iterator_base
node_iterator_value<V> > : public boost::iterator_facade<
{ node_iterator_base<V>, node_iterator_value<V>,
private: std::forward_iterator_tag, node_iterator_value<V> > {
struct enabler {}; private:
struct enabler {};
public:
typedef typename node_iterator_type<V>::seq SeqIter; public:
typedef typename node_iterator_type<V>::map MapIter; typedef typename node_iterator_type<V>::seq SeqIter;
typedef node_iterator_value<V> value_type; typedef typename node_iterator_type<V>::map MapIter;
typedef node_iterator_value<V> value_type;
node_iterator_base(): m_type(iterator_type::None) {}
explicit node_iterator_base(SeqIter seqIt): m_type(iterator_type::Sequence), m_seqIt(seqIt) {} node_iterator_base() : m_type(iterator_type::None) {}
explicit node_iterator_base(MapIter mapIt, MapIter mapEnd): m_type(iterator_type::Map), m_mapIt(mapIt), m_mapEnd(mapEnd) { explicit node_iterator_base(SeqIter seqIt)
m_mapIt = increment_until_defined(m_mapIt); : m_type(iterator_type::Sequence), m_seqIt(seqIt) {}
} explicit node_iterator_base(MapIter mapIt, MapIter mapEnd)
: m_type(iterator_type::Map), m_mapIt(mapIt), m_mapEnd(mapEnd) {
template<typename W> m_mapIt = increment_until_defined(m_mapIt);
node_iterator_base(const node_iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler()) }
: m_type(rhs.m_type), m_seqIt(rhs.m_seqIt), m_mapIt(rhs.m_mapIt), m_mapEnd(rhs.m_mapEnd) {}
template <typename W>
private: node_iterator_base(
friend class boost::iterator_core_access; const node_iterator_base<W>& rhs,
template<typename> friend class node_iterator_base; typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type =
enabler())
template<typename W> : m_type(rhs.m_type),
bool equal(const node_iterator_base<W>& rhs) const { m_seqIt(rhs.m_seqIt),
if(m_type != rhs.m_type) m_mapIt(rhs.m_mapIt),
return false; m_mapEnd(rhs.m_mapEnd) {}
switch(m_type) { private:
case iterator_type::None: return true; friend class boost::iterator_core_access;
case iterator_type::Sequence: return m_seqIt == rhs.m_seqIt; template <typename>
case iterator_type::Map: return m_mapIt == rhs.m_mapIt; friend class node_iterator_base;
}
return true; template <typename W>
} bool equal(const node_iterator_base<W>& rhs) const {
if (m_type != rhs.m_type)
void increment() { return false;
switch(m_type) {
case iterator_type::None: break; switch (m_type) {
case iterator_type::Sequence: case iterator_type::None:
++m_seqIt; return true;
break; case iterator_type::Sequence:
case iterator_type::Map: return m_seqIt == rhs.m_seqIt;
++m_mapIt; case iterator_type::Map:
m_mapIt = increment_until_defined(m_mapIt); return m_mapIt == rhs.m_mapIt;
break; }
} return true;
} }
value_type dereference() const { void increment() {
switch(m_type) { switch (m_type) {
case iterator_type::None: return value_type(); case iterator_type::None:
case iterator_type::Sequence: return value_type(**m_seqIt); break;
case iterator_type::Map: return value_type(*m_mapIt->first, *m_mapIt->second); case iterator_type::Sequence:
} ++m_seqIt;
return value_type(); break;
} case iterator_type::Map:
++m_mapIt;
MapIter increment_until_defined(MapIter it) { m_mapIt = increment_until_defined(m_mapIt);
while(it != m_mapEnd && !is_defined(it)) break;
++it; }
return it; }
}
value_type dereference() const {
bool is_defined(MapIter it) const { switch (m_type) {
return it->first->is_defined() && it->second->is_defined(); case iterator_type::None:
} return value_type();
case iterator_type::Sequence:
private: return value_type(**m_seqIt);
typename iterator_type::value m_type; case iterator_type::Map:
return value_type(*m_mapIt->first, *m_mapIt->second);
SeqIter m_seqIt; }
MapIter m_mapIt, m_mapEnd; return value_type();
}; }
typedef node_iterator_base<node> node_iterator; MapIter increment_until_defined(MapIter it) {
typedef node_iterator_base<const node> const_node_iterator; while (it != m_mapEnd && !is_defined(it))
} ++it;
return it;
}
bool is_defined(MapIter it) const {
return it->first->is_defined() && it->second->is_defined();
}
private:
typename iterator_type::value m_type;
SeqIter m_seqIt;
MapIter m_mapIt, m_mapEnd;
};
typedef node_iterator_base<node> node_iterator;
typedef node_iterator_base<const node> const_node_iterator;
}
} }
#endif // VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/detail/node_ref.h
#ifndef VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/type.h" #include "yaml-cpp/node/type.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_data.h" #include "yaml-cpp/node/detail/node_data.h"
#include <boost/utility.hpp> #include <boost/utility.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail class node_ref : private boost::noncopyable {
{ public:
class node_ref: private boost::noncopyable node_ref() : m_pData(new node_data) {}
{
public: bool is_defined() const { return m_pData->is_defined(); }
node_ref(): m_pData(new node_data) {} NodeType::value type() const { return m_pData->type(); }
const std::string& scalar() const { return m_pData->scalar(); }
bool is_defined() const { return m_pData->is_defined(); } const std::string& tag() const { return m_pData->tag(); }
NodeType::value type() const { return m_pData->type(); }
const std::string& scalar() const { return m_pData->scalar(); } void mark_defined() { m_pData->mark_defined(); }
const std::string& tag() const { return m_pData->tag(); } void set_data(const node_ref& rhs) { m_pData = rhs.m_pData; }
void mark_defined() { m_pData->mark_defined(); } void set_type(NodeType::value type) { m_pData->set_type(type); }
void set_data(const node_ref& rhs) { m_pData = rhs.m_pData; } void set_tag(const std::string& tag) { m_pData->set_tag(tag); }
void set_null() { m_pData->set_null(); }
void set_type(NodeType::value type) { m_pData->set_type(type); } void set_scalar(const std::string& scalar) { m_pData->set_scalar(scalar); }
void set_tag(const std::string& tag) { m_pData->set_tag(tag); }
void set_null() { m_pData->set_null(); } // size/iterator
void set_scalar(const std::string& scalar) { m_pData->set_scalar(scalar); } std::size_t size() const { return m_pData->size(); }
// size/iterator const_node_iterator begin() const {
std::size_t size() const { return m_pData->size(); } return static_cast<const node_data&>(*m_pData).begin();
}
const_node_iterator begin() const { return static_cast<const node_data&>(*m_pData).begin(); } node_iterator begin() { return m_pData->begin(); }
node_iterator begin() {return m_pData->begin(); }
const_node_iterator end() const { return static_cast<const node_data&>(*m_pData).end(); }
node_iterator end() {return m_pData->end(); }
// sequence const_node_iterator end() const {
void push_back(node& node, shared_memory_holder pMemory) { m_pData->push_back(node, pMemory); } return static_cast<const node_data&>(*m_pData).end();
void insert(node& key, node& value, shared_memory_holder pMemory) { m_pData->insert(key, value, pMemory); } }
node_iterator end() { return m_pData->end(); }
// indexing
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const { return static_cast<const node_data&>(*m_pData).get(key, pMemory); }
template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) { return m_pData->get(key, pMemory); }
template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory) { return m_pData->remove(key, pMemory); }
node& get(node& key, shared_memory_holder pMemory) const { return static_cast<const node_data&>(*m_pData).get(key, pMemory); }
node& get(node& key, shared_memory_holder pMemory) { return m_pData->get(key, pMemory); }
bool remove(node& key, shared_memory_holder pMemory) { return m_pData->remove(key, pMemory); }
// map
template<typename Key, typename Value>
void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory) { m_pData->force_insert(key, value, pMemory); }
private: // sequence
shared_node_data m_pData; void push_back(node& node, shared_memory_holder pMemory) {
}; m_pData->push_back(node, pMemory);
} }
void insert(node& key, node& value, shared_memory_holder pMemory) {
m_pData->insert(key, value, pMemory);
}
// indexing
template <typename Key>
node& get(const Key& key, shared_memory_holder pMemory) const {
return static_cast<const node_data&>(*m_pData).get(key, pMemory);
}
template <typename Key>
node& get(const Key& key, shared_memory_holder pMemory) {
return m_pData->get(key, pMemory);
}
template <typename Key>
bool remove(const Key& key, shared_memory_holder pMemory) {
return m_pData->remove(key, pMemory);
}
node& get(node& key, shared_memory_holder pMemory) const {
return static_cast<const node_data&>(*m_pData).get(key, pMemory);
}
node& get(node& key, shared_memory_holder pMemory) {
return m_pData->get(key, pMemory);
}
bool remove(node& key, shared_memory_holder pMemory) {
return m_pData->remove(key, pMemory);
}
// map
template <typename Key, typename Value>
void force_insert(const Key& key, const Value& value,
shared_memory_holder pMemory) {
m_pData->force_insert(key, value, pMemory);
}
private:
shared_node_data m_pData;
};
}
} }
#endif // VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/emit.h
#ifndef NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include <string> #include <string>
#include <iosfwd> #include <iosfwd>
namespace YAML namespace YAML {
{ class Emitter;
class Emitter; class Node;
class Node;
Emitter& operator<<(Emitter& out, const Node& node);
Emitter& operator << (Emitter& out, const Node& node); std::ostream& operator<<(std::ostream& out, const Node& node);
std::ostream& operator << (std::ostream& out, const Node& node);
std::string Dump(const Node& node);
}
#endif // NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 std::string Dump(const Node& node);
}
#endif // NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/iterator.h
#ifndef VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/node.h" #include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/detail/iterator_fwd.h" #include "yaml-cpp/node/detail/iterator_fwd.h"
...@@ -14,15 +15,17 @@ ...@@ -14,15 +15,17 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail { struct iterator_value : public Node, std::pair<Node, Node> {
struct iterator_value: public Node, std::pair<Node, Node> { iterator_value() {}
iterator_value() {} explicit iterator_value(const Node& rhs)
explicit iterator_value(const Node& rhs): Node(rhs), std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} : Node(rhs),
explicit iterator_value(const Node& key, const Node& value): Node(Node::ZombieNode), std::pair<Node, Node>(key, value) {} std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}
}; explicit iterator_value(const Node& key, const Node& value)
} : Node(Node::ZombieNode), std::pair<Node, Node>(key, value) {}
};
}
} }
#endif // VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/node.h
#ifndef NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/type.h" #include "yaml-cpp/node/type.h"
...@@ -13,104 +14,115 @@ ...@@ -13,104 +14,115 @@
#include "yaml-cpp/node/detail/bool_type.h" #include "yaml-cpp/node/detail/bool_type.h"
#include <stdexcept> #include <stdexcept>
namespace YAML namespace YAML {
{ class Node {
class Node public:
{ friend class NodeBuilder;
public: friend class NodeEvents;
friend class NodeBuilder; friend struct detail::iterator_value;
friend class NodeEvents; friend class detail::node_data;
friend struct detail::iterator_value; template <typename>
friend class detail::node_data; friend class detail::iterator_base;
template<typename> friend class detail::iterator_base; template <typename T, typename S>
template<typename T, typename S> friend struct as_if; friend struct as_if;
typedef YAML::iterator iterator; typedef YAML::iterator iterator;
typedef YAML::const_iterator const_iterator; typedef YAML::const_iterator const_iterator;
Node(); Node();
explicit Node(NodeType::value type); explicit Node(NodeType::value type);
template<typename T> explicit Node(const T& rhs); template <typename T>
explicit Node(const detail::iterator_value& rhs); explicit Node(const T& rhs);
Node(const Node& rhs); explicit Node(const detail::iterator_value& rhs);
~Node(); Node(const Node& rhs);
~Node();
NodeType::value Type() const;
bool IsDefined() const; NodeType::value Type() const;
bool IsNull() const { return Type() == NodeType::Null; } bool IsDefined() const;
bool IsScalar() const { return Type() == NodeType::Scalar; } bool IsNull() const { return Type() == NodeType::Null; }
bool IsSequence() const { return Type() == NodeType::Sequence; } bool IsScalar() const { return Type() == NodeType::Scalar; }
bool IsMap() const { return Type() == NodeType::Map; } bool IsSequence() const { return Type() == NodeType::Sequence; }
bool IsMap() const { return Type() == NodeType::Map; }
// bool conversions
YAML_CPP_OPERATOR_BOOL(); // bool conversions
bool operator!() const { return !IsDefined(); } YAML_CPP_OPERATOR_BOOL();
bool operator!() const { return !IsDefined(); }
// access
template<typename T> const T as() const; // access
template<typename T, typename S> const T as(const S& fallback) const; template <typename T>
const std::string& Scalar() const; const T as() const;
const std::string& Tag() const; template <typename T, typename S>
void SetTag(const std::string& tag); const T as(const S& fallback) const;
const std::string& Scalar() const;
// assignment const std::string& Tag() const;
bool is(const Node& rhs) const; void SetTag(const std::string& tag);
template<typename T> Node& operator=(const T& rhs);
Node& operator=(const Node& rhs); // assignment
void reset(const Node& rhs = Node()); bool is(const Node& rhs) const;
template <typename T>
// size/iterator Node& operator=(const T& rhs);
std::size_t size() const; Node& operator=(const Node& rhs);
void reset(const Node& rhs = Node());
const_iterator begin() const;
iterator begin(); // size/iterator
std::size_t size() const;
const_iterator end() const;
iterator end(); const_iterator begin() const;
iterator begin();
// sequence
template<typename T> void push_back(const T& rhs); const_iterator end() const;
void push_back(const Node& rhs); iterator end();
// indexing // sequence
template<typename Key> const Node operator[](const Key& key) const; template <typename T>
template<typename Key> Node operator[](const Key& key); void push_back(const T& rhs);
template<typename Key> bool remove(const Key& key); void push_back(const Node& rhs);
const Node operator[](const Node& key) const; // indexing
Node operator[](const Node& key); template <typename Key>
bool remove(const Node& key); const Node operator[](const Key& key) const;
template <typename Key>
// map Node operator[](const Key& key);
template<typename Key, typename Value> template <typename Key>
void force_insert(const Key& key, const Value& value); bool remove(const Key& key);
private: const Node operator[](const Node& key) const;
enum Zombie { ZombieNode }; Node operator[](const Node& key);
explicit Node(Zombie); bool remove(const Node& key);
explicit Node(detail::node& node, detail::shared_memory_holder pMemory);
// map
void EnsureNodeExists() const; template <typename Key, typename Value>
void force_insert(const Key& key, const Value& value);
template<typename T> void Assign(const T& rhs);
void Assign(const char *rhs); private:
void Assign(char *rhs); enum Zombie {
ZombieNode
void AssignData(const Node& rhs); };
void AssignNode(const Node& rhs); explicit Node(Zombie);
explicit Node(detail::node& node, detail::shared_memory_holder pMemory);
private:
bool m_isValid; void EnsureNodeExists() const;
mutable detail::shared_memory_holder m_pMemory;
mutable detail::node *m_pNode; template <typename T>
}; void Assign(const T& rhs);
void Assign(const char* rhs);
bool operator==(const Node& lhs, const Node& rhs); void Assign(char* rhs);
Node Clone(const Node& node); void AssignData(const Node& rhs);
void AssignNode(const Node& rhs);
template<typename T>
struct convert; private:
bool m_isValid;
mutable detail::shared_memory_holder m_pMemory;
mutable detail::node* m_pNode;
};
bool operator==(const Node& lhs, const Node& rhs);
Node Clone(const Node& node);
template <typename T>
struct convert;
} }
#endif // NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/parse.h
#ifndef VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
...@@ -9,20 +11,18 @@ ...@@ -9,20 +11,18 @@
#include <string> #include <string>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ class Node;
class Node;
Node Load(const std::string& input);
Node Load(const char *input);
Node Load(std::istream& input);
Node LoadFile(const std::string& filename);
std::vector<Node> LoadAll(const std::string& input); Node Load(const std::string& input);
std::vector<Node> LoadAll(const char *input); Node Load(const char* input);
std::vector<Node> LoadAll(std::istream& input); Node Load(std::istream& input);
std::vector<Node> LoadAllFromFile(const std::string& filename); Node LoadFile(const std::string& filename);
}
#endif // VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 std::vector<Node> LoadAll(const std::string& input);
std::vector<Node> LoadAll(const char* input);
std::vector<Node> LoadAll(std::istream& input);
std::vector<Node> LoadAllFromFile(const std::string& filename);
}
#endif // VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/ptr.h
#ifndef VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace YAML namespace YAML {
{ namespace detail {
namespace detail { class node;
class node; class node_ref;
class node_ref; class node_data;
class node_data; class memory;
class memory; class memory_holder;
class memory_holder;
typedef boost::shared_ptr<node> shared_node; typedef boost::shared_ptr<node> shared_node;
typedef boost::shared_ptr<node_ref> shared_node_ref; typedef boost::shared_ptr<node_ref> shared_node_ref;
typedef boost::shared_ptr<node_data> shared_node_data; typedef boost::shared_ptr<node_data> shared_node_data;
typedef boost::shared_ptr<memory_holder> shared_memory_holder; typedef boost::shared_ptr<memory_holder> shared_memory_holder;
typedef boost::shared_ptr<memory> shared_memory; typedef boost::shared_ptr<memory> shared_memory;
} }
} }
#endif // VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/node/type.h
#ifndef VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
namespace YAML {
namespace YAML struct NodeType {
{ enum value {
struct NodeType { enum value { Undefined, Null, Scalar, Sequence, Map }; }; Undefined,
Null,
Scalar,
Sequence,
Map
};
};
} }
#endif // VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/parser.h
#ifndef PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/noncopyable.h" #include "yaml-cpp/noncopyable.h"
#include <ios> #include <ios>
#include <memory> #include <memory>
namespace YAML namespace YAML {
{ struct Directives;
struct Directives; struct Token;
struct Token; class EventHandler;
class EventHandler; class Scanner;
class Scanner;
class YAML_CPP_API Parser : private noncopyable {
class YAML_CPP_API Parser: private noncopyable public:
{ Parser();
public: Parser(std::istream& in);
Parser(); ~Parser();
Parser(std::istream& in);
~Parser(); operator bool() const;
operator bool() const; void Load(std::istream& in);
bool HandleNextDocument(EventHandler& eventHandler);
void Load(std::istream& in);
bool HandleNextDocument(EventHandler& eventHandler); void PrintTokens(std::ostream& out);
void PrintTokens(std::ostream& out); private:
void ParseDirectives();
private: void HandleDirective(const Token& token);
void ParseDirectives(); void HandleYamlDirective(const Token& token);
void HandleDirective(const Token& token); void HandleTagDirective(const Token& token);
void HandleYamlDirective(const Token& token);
void HandleTagDirective(const Token& token); private:
std::auto_ptr<Scanner> m_pScanner;
private: std::auto_ptr<Directives> m_pDirectives;
std::auto_ptr<Scanner> m_pScanner; };
std::auto_ptr<Directives> m_pDirectives;
};
} }
#endif // PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
include/yaml-cpp/yaml.h
#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
...@@ -18,4 +20,4 @@ ...@@ -18,4 +20,4 @@
#include "yaml-cpp/node/parse.h" #include "yaml-cpp/node/parse.h"
#include "yaml-cpp/node/emit.h" #include "yaml-cpp/node/emit.h"
#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
src/convert.cpp
...@@ -2,82 +2,72 @@ ...@@ -2,82 +2,72 @@
#include "yaml-cpp/node/impl.h" #include "yaml-cpp/node/impl.h"
#include <algorithm> #include <algorithm>
namespace namespace {
{ // we're not gonna mess with the mess that is all the isupper/etc. functions
// we're not gonna mess with the mess that is all the isupper/etc. functions bool IsLower(char ch) { return 'a' <= ch && ch <= 'z'; }
bool IsLower(char ch) { return 'a' <= ch && ch <= 'z'; } bool IsUpper(char ch) { return 'A' <= ch && ch <= 'Z'; }
bool IsUpper(char ch) { return 'A' <= ch && ch <= 'Z'; } char ToLower(char ch) { return IsUpper(ch) ? ch + 'a' - 'A' : ch; }
char ToLower(char ch) { return IsUpper(ch) ? ch + 'a' - 'A' : ch; }
std::string tolower(const std::string& str) {
std::string tolower(const std::string& str) std::string s(str);
{ std::transform(s.begin(), s.end(), s.begin(), ToLower);
std::string s(str); return s;
std::transform(s.begin(), s.end(), s.begin(), ToLower); }
return s;
} template <typename T>
bool IsEntirely(const std::string& str, T func) {
template <typename T> for (std::size_t i = 0; i < str.size(); i++)
bool IsEntirely(const std::string& str, T func) if (!func(str[i]))
{ return false;
for(std::size_t i=0;i<str.size();i++)
if(!func(str[i])) return true;
return false;
return true;
}
// IsFlexibleCase
// . Returns true if 'str' is:
// . UPPERCASE
// . lowercase
// . Capitalized
bool IsFlexibleCase(const std::string& str)
{
if(str.empty())
return true;
if(IsEntirely(str, IsLower))
return true;
bool firstcaps = IsUpper(str[0]);
std::string rest = str.substr(1);
return firstcaps && (IsEntirely(rest, IsLower) || IsEntirely(rest, IsUpper));
}
} }
namespace YAML // IsFlexibleCase
{ // . Returns true if 'str' is:
bool convert<bool>::decode(const Node& node, bool& rhs) { // . UPPERCASE
if(!node.IsScalar()) // . lowercase
return false; // . Capitalized
bool IsFlexibleCase(const std::string& str) {
// we can't use iostream bool extraction operators as they don't if (str.empty())
// recognize all possible values in the table below (taken from return true;
// http://yaml.org/type/bool.html)
static const struct { if (IsEntirely(str, IsLower))
std::string truename, falsename; return true;
} names[] = {
{ "y", "n" }, bool firstcaps = IsUpper(str[0]);
{ "yes", "no" }, std::string rest = str.substr(1);
{ "true", "false" }, return firstcaps && (IsEntirely(rest, IsLower) || IsEntirely(rest, IsUpper));
{ "on", "off" }, }
}; }
if(!IsFlexibleCase(node.Scalar())) namespace YAML {
return false; bool convert<bool>::decode(const Node& node, bool& rhs) {
if (!node.IsScalar())
for(unsigned i=0;i<sizeof(names)/sizeof(names[0]);i++) { return false;
if(names[i].truename == tolower(node.Scalar())) {
rhs = true; // we can't use iostream bool extraction operators as they don't
return true; // recognize all possible values in the table below (taken from
} // http://yaml.org/type/bool.html)
static const struct {
if(names[i].falsename == tolower(node.Scalar())) { std::string truename, falsename;
rhs = false; } names[] = {{"y", "n"}, {"yes", "no"}, {"true", "false"}, {"on", "off"}, };
return true;
} if (!IsFlexibleCase(node.Scalar()))
} return false;
return false; for (unsigned i = 0; i < sizeof(names) / sizeof(names[0]); i++) {
} if (names[i].truename == tolower(node.Scalar())) {
rhs = true;
return true;
}
if (names[i].falsename == tolower(node.Scalar())) {
rhs = false;
return true;
}
}
return false;
}
} }
src/emit.cpp
...@@ -3,27 +3,23 @@ ...@@ -3,27 +3,23 @@
#include "yaml-cpp/emitter.h" #include "yaml-cpp/emitter.h"
#include "nodeevents.h" #include "nodeevents.h"
namespace YAML namespace YAML {
{ Emitter& operator<<(Emitter& out, const Node& node) {
Emitter& operator << (Emitter& out, const Node& node) EmitFromEvents emitFromEvents(out);
{ NodeEvents events(node);
EmitFromEvents emitFromEvents(out); events.Emit(emitFromEvents);
NodeEvents events(node); return out;
events.Emit(emitFromEvents); }
return out;
} std::ostream& operator<<(std::ostream& out, const Node& node) {
Emitter emitter(out);
std::ostream& operator << (std::ostream& out, const Node& node) emitter << node;
{ return out;
Emitter emitter(out); }
emitter << node;
return out;
}
std::string Dump(const Node& node) std::string Dump(const Node& node) {
{ Emitter emitter;
Emitter emitter; emitter << node;
emitter << node; return emitter.c_str();
return emitter.c_str(); }
}
} }
src/memory.cpp
#include "yaml-cpp/node/detail/memory.h" #include "yaml-cpp/node/detail/memory.h"
#include "yaml-cpp/node/detail/node.h" #include "yaml-cpp/node/detail/node.h"
namespace YAML namespace YAML {
{ namespace detail {
namespace detail void memory_holder::merge(memory_holder& rhs) {
{ if (m_pMemory == rhs.m_pMemory)
void memory_holder::merge(memory_holder& rhs) return;
{
if(m_pMemory == rhs.m_pMemory) m_pMemory->merge(*rhs.m_pMemory);
return; rhs.m_pMemory = m_pMemory;
}
m_pMemory->merge(*rhs.m_pMemory);
rhs.m_pMemory = m_pMemory; node& memory::create_node() {
} shared_node pNode(new node);
m_nodes.insert(pNode);
node& memory::create_node() return *pNode;
{ }
shared_node pNode(new node);
m_nodes.insert(pNode); void memory::merge(const memory& rhs) {
return *pNode; m_nodes.insert(rhs.m_nodes.begin(), rhs.m_nodes.end());
} }
}
void memory::merge(const memory& rhs)
{
m_nodes.insert(rhs.m_nodes.begin(), rhs.m_nodes.end());
}
}
} }
src/node.cpp
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
#include "nodebuilder.h" #include "nodebuilder.h"
#include "nodeevents.h" #include "nodeevents.h"
namespace YAML namespace YAML {
{ Node Clone(const Node& node) {
Node Clone(const Node& node) NodeEvents events(node);
{ NodeBuilder builder;
NodeEvents events(node); events.Emit(builder);
NodeBuilder builder; return builder.Root();
events.Emit(builder); }
return builder.Root();
}
} }
src/nodebuilder.cpp
...@@ -4,135 +4,119 @@ ...@@ -4,135 +4,119 @@
#include "yaml-cpp/node/impl.h" #include "yaml-cpp/node/impl.h"
#include <cassert> #include <cassert>
namespace YAML namespace YAML {
{ NodeBuilder::NodeBuilder()
NodeBuilder::NodeBuilder(): m_pMemory(new detail::memory_holder), m_pRoot(0), m_mapDepth(0) : m_pMemory(new detail::memory_holder), m_pRoot(0), m_mapDepth(0) {
{ m_anchors.push_back(0); // since the anchors start at 1
m_anchors.push_back(0); // since the anchors start at 1 }
}
NodeBuilder::~NodeBuilder() {}
NodeBuilder::~NodeBuilder()
{ Node NodeBuilder::Root() {
} if (!m_pRoot)
return Node();
Node NodeBuilder::Root()
{ return Node(*m_pRoot, m_pMemory);
if(!m_pRoot) }
return Node();
void NodeBuilder::OnDocumentStart(const Mark&) {}
return Node(*m_pRoot, m_pMemory);
} void NodeBuilder::OnDocumentEnd() {}
void NodeBuilder::OnDocumentStart(const Mark&) void NodeBuilder::OnNull(const Mark& /* mark */, anchor_t anchor) {
{ detail::node& node = Push(anchor);
} node.set_null();
Pop();
void NodeBuilder::OnDocumentEnd() }
{
} void NodeBuilder::OnAlias(const Mark& /* mark */, anchor_t anchor) {
detail::node& node = *m_anchors[anchor];
void NodeBuilder::OnNull(const Mark& /* mark */, anchor_t anchor) Push(node);
{ Pop();
detail::node& node = Push(anchor); }
node.set_null();
Pop(); void NodeBuilder::OnScalar(const Mark& /* mark */, const std::string& tag,
} anchor_t anchor, const std::string& value) {
detail::node& node = Push(anchor);
void NodeBuilder::OnAlias(const Mark& /* mark */, anchor_t anchor) node.set_scalar(value);
{ node.set_tag(tag);
detail::node& node = *m_anchors[anchor]; Pop();
Push(node); }
Pop();
} void NodeBuilder::OnSequenceStart(const Mark& /* mark */,
const std::string& tag, anchor_t anchor) {
void NodeBuilder::OnScalar(const Mark& /* mark */, const std::string& tag, anchor_t anchor, const std::string& value) detail::node& node = Push(anchor);
{ node.set_tag(tag);
detail::node& node = Push(anchor); node.set_type(NodeType::Sequence);
node.set_scalar(value); }
node.set_tag(tag);
Pop(); void NodeBuilder::OnSequenceEnd() { Pop(); }
}
void NodeBuilder::OnMapStart(const Mark& /* mark */, const std::string& tag,
void NodeBuilder::OnSequenceStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor) anchor_t anchor) {
{ detail::node& node = Push(anchor);
detail::node& node = Push(anchor); node.set_type(NodeType::Map);
node.set_tag(tag); node.set_tag(tag);
node.set_type(NodeType::Sequence); m_mapDepth++;
} }
void NodeBuilder::OnSequenceEnd() void NodeBuilder::OnMapEnd() {
{ assert(m_mapDepth > 0);
Pop(); m_mapDepth--;
} Pop();
}
void NodeBuilder::OnMapStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor)
{ detail::node& NodeBuilder::Push(anchor_t anchor) {
detail::node& node = Push(anchor); detail::node& node = m_pMemory->create_node();
node.set_type(NodeType::Map); RegisterAnchor(anchor, node);
node.set_tag(tag); Push(node);
m_mapDepth++; return node;
} }
void NodeBuilder::OnMapEnd() void NodeBuilder::Push(detail::node& node) {
{ const bool needsKey =
assert(m_mapDepth > 0); (!m_stack.empty() && m_stack.back()->type() == NodeType::Map &&
m_mapDepth--; m_keys.size() < m_mapDepth);
Pop();
} m_stack.push_back(&node);
if (needsKey)
detail::node& NodeBuilder::Push(anchor_t anchor) m_keys.push_back(PushedKey(&node, false));
{ }
detail::node& node = m_pMemory->create_node();
RegisterAnchor(anchor, node); void NodeBuilder::Pop() {
Push(node); assert(!m_stack.empty());
return node; if (m_stack.size() == 1) {
} m_pRoot = m_stack[0];
m_stack.pop_back();
void NodeBuilder::Push(detail::node& node) return;
{ }
const bool needsKey = (!m_stack.empty() && m_stack.back()->type() == NodeType::Map && m_keys.size() < m_mapDepth);
detail::node& node = *m_stack.back();
m_stack.push_back(&node); m_stack.pop_back();
if(needsKey)
m_keys.push_back(PushedKey(&node, false)); detail::node& collection = *m_stack.back();
}
if (collection.type() == NodeType::Sequence) {
void NodeBuilder::Pop() collection.push_back(node, m_pMemory);
{ } else if (collection.type() == NodeType::Map) {
assert(!m_stack.empty()); assert(!m_keys.empty());
if(m_stack.size() == 1) { PushedKey& key = m_keys.back();
m_pRoot = m_stack[0]; if (key.second) {
m_stack.pop_back(); collection.insert(*key.first, node, m_pMemory);
return; m_keys.pop_back();
} } else {
key.second = true;
detail::node& node = *m_stack.back(); }
m_stack.pop_back(); } else {
assert(false);
detail::node& collection = *m_stack.back(); m_stack.clear();
}
if(collection.type() == NodeType::Sequence) { }
collection.push_back(node, m_pMemory);
} else if(collection.type() == NodeType::Map) { void NodeBuilder::RegisterAnchor(anchor_t anchor, detail::node& node) {
assert(!m_keys.empty()); if (anchor) {
PushedKey& key = m_keys.back(); assert(anchor == m_anchors.size());
if(key.second) { m_anchors.push_back(&node);
collection.insert(*key.first, node, m_pMemory); }
m_keys.pop_back(); }
} else {
key.second = true;
}
} else {
assert(false);
m_stack.clear();
}
}
void NodeBuilder::RegisterAnchor(anchor_t anchor, detail::node& node)
{
if(anchor) {
assert(anchor == m_anchors.size());
m_anchors.push_back(&node);
}
}
} }
src/nodebuilder.h
#ifndef NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
...@@ -9,50 +11,50 @@ ...@@ -9,50 +11,50 @@
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ class Node;
class Node;
class NodeBuilder : public EventHandler {
class NodeBuilder: public EventHandler public:
{ NodeBuilder();
public: virtual ~NodeBuilder();
NodeBuilder();
virtual ~NodeBuilder(); Node Root();
Node Root(); virtual void OnDocumentStart(const Mark& mark);
virtual void OnDocumentEnd();
virtual void OnDocumentStart(const Mark& mark);
virtual void OnDocumentEnd(); virtual void OnNull(const Mark& mark, anchor_t anchor);
virtual void OnAlias(const Mark& mark, anchor_t anchor);
virtual void OnNull(const Mark& mark, anchor_t anchor); virtual void OnScalar(const Mark& mark, const std::string& tag,
virtual void OnAlias(const Mark& mark, anchor_t anchor); anchor_t anchor, const std::string& value);
virtual void OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value);
virtual void OnSequenceStart(const Mark& mark, const std::string& tag,
virtual void OnSequenceStart(const Mark& mark, const std::string& tag, anchor_t anchor); anchor_t anchor);
virtual void OnSequenceEnd(); virtual void OnSequenceEnd();
virtual void OnMapStart(const Mark& mark, const std::string& tag, anchor_t anchor);
virtual void OnMapEnd();
private:
detail::node& Push(anchor_t anchor);
void Push(detail::node& node);
void Pop();
void RegisterAnchor(anchor_t anchor, detail::node& node);
private:
detail::shared_memory_holder m_pMemory;
detail::node *m_pRoot;
typedef std::vector<detail::node *> Nodes;
Nodes m_stack;
Nodes m_anchors;
typedef std::pair<detail::node *, bool> PushedKey;
std::vector<PushedKey> m_keys;
std::size_t m_mapDepth;
};
}
#endif // NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 virtual void OnMapStart(const Mark& mark, const std::string& tag,
anchor_t anchor);
virtual void OnMapEnd();
private:
detail::node& Push(anchor_t anchor);
void Push(detail::node& node);
void Pop();
void RegisterAnchor(anchor_t anchor, detail::node& node);
private:
detail::shared_memory_holder m_pMemory;
detail::node* m_pRoot;
typedef std::vector<detail::node*> Nodes;
Nodes m_stack;
Nodes m_anchors;
typedef std::pair<detail::node*, bool> PushedKey;
std::vector<PushedKey> m_keys;
std::size_t m_mapDepth;
};
}
#endif // NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
src/nodeevents.cpp
...@@ -4,98 +4,96 @@ ...@@ -4,98 +4,96 @@
#include "yaml-cpp/eventhandler.h" #include "yaml-cpp/eventhandler.h"
#include "yaml-cpp/mark.h" #include "yaml-cpp/mark.h"
namespace YAML namespace YAML {
{ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) {
void NodeEvents::AliasManager::RegisterReference(const detail::node& node) m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor()));
{ }
m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor()));
} anchor_t NodeEvents::AliasManager::LookupAnchor(const detail::node& node)
const {
anchor_t NodeEvents::AliasManager::LookupAnchor(const detail::node& node) const AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref());
{ if (it == m_anchorByIdentity.end())
AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref()); return 0;
if(it == m_anchorByIdentity.end()) return it->second;
return 0; }
return it->second;
} NodeEvents::NodeEvents(const Node& node)
: m_pMemory(node.m_pMemory), m_root(node.m_pNode) {
if (m_root)
Setup(*m_root);
}
void NodeEvents::Setup(const detail::node& node) {
int& refCount = m_refCount[node.ref()];
refCount++;
if (refCount > 1)
return;
NodeEvents::NodeEvents(const Node& node): m_pMemory(node.m_pMemory), m_root(node.m_pNode) if (node.type() == NodeType::Sequence) {
{ for (detail::const_node_iterator it = node.begin(); it != node.end(); ++it)
if(m_root) Setup(**it);
Setup(*m_root); } else if (node.type() == NodeType::Map) {
} for (detail::const_node_iterator it = node.begin(); it != node.end();
++it) {
Setup(*it->first);
Setup(*it->second);
}
}
}
void NodeEvents::Emit(EventHandler& handler) {
AliasManager am;
handler.OnDocumentStart(Mark());
if (m_root)
Emit(*m_root, handler, am);
handler.OnDocumentEnd();
}
void NodeEvents::Setup(const detail::node& node) void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
{ AliasManager& am) const {
int& refCount = m_refCount[node.ref()]; anchor_t anchor = NullAnchor;
refCount++; if (IsAliased(node)) {
if(refCount > 1) anchor = am.LookupAnchor(node);
return; if (anchor) {
handler.OnAlias(Mark(), anchor);
if(node.type() == NodeType::Sequence) { return;
for(detail::const_node_iterator it=node.begin();it!=node.end();++it) }
Setup(**it);
} else if(node.type() == NodeType::Map) {
for(detail::const_node_iterator it=node.begin();it!=node.end();++it) {
Setup(*it->first);
Setup(*it->second);
}
}
}
void NodeEvents::Emit(EventHandler& handler) am.RegisterReference(node);
{ anchor = am.LookupAnchor(node);
AliasManager am; }
handler.OnDocumentStart(Mark());
if(m_root)
Emit(*m_root, handler, am);
handler.OnDocumentEnd();
}
void NodeEvents::Emit(const detail::node& node, EventHandler& handler, AliasManager& am) const switch (node.type()) {
{ case NodeType::Undefined:
anchor_t anchor = NullAnchor; break;
if(IsAliased(node)) { case NodeType::Null:
anchor = am.LookupAnchor(node); handler.OnNull(Mark(), anchor);
if(anchor) { break;
handler.OnAlias(Mark(), anchor); case NodeType::Scalar:
return; handler.OnScalar(Mark(), node.tag(), anchor, node.scalar());
} break;
case NodeType::Sequence:
am.RegisterReference(node); handler.OnSequenceStart(Mark(), node.tag(), anchor);
anchor = am.LookupAnchor(node); for (detail::const_node_iterator it = node.begin(); it != node.end();
} ++it)
Emit(**it, handler, am);
switch(node.type()) { handler.OnSequenceEnd();
case NodeType::Undefined: break;
break; case NodeType::Map:
case NodeType::Null: handler.OnMapStart(Mark(), node.tag(), anchor);
handler.OnNull(Mark(), anchor); for (detail::const_node_iterator it = node.begin(); it != node.end();
break; ++it) {
case NodeType::Scalar: Emit(*it->first, handler, am);
handler.OnScalar(Mark(), node.tag(), anchor, node.scalar()); Emit(*it->second, handler, am);
break; }
case NodeType::Sequence: handler.OnMapEnd();
handler.OnSequenceStart(Mark(), node.tag(), anchor); break;
for(detail::const_node_iterator it=node.begin();it!=node.end();++it) }
Emit(**it, handler, am); }
handler.OnSequenceEnd();
break;
case NodeType::Map:
handler.OnMapStart(Mark(), node.tag(), anchor);
for(detail::const_node_iterator it=node.begin();it!=node.end();++it) {
Emit(*it->first, handler, am);
Emit(*it->second, handler, am);
}
handler.OnMapEnd();
break;
}
}
bool NodeEvents::IsAliased(const detail::node& node) const bool NodeEvents::IsAliased(const detail::node& node) const {
{ RefCount::const_iterator it = m_refCount.find(node.ref());
RefCount::const_iterator it = m_refCount.find(node.ref()); return it != m_refCount.end() && it->second > 1;
return it != m_refCount.end() && it->second > 1; }
}
} }
src/nodeevents.h
#ifndef NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
...@@ -10,48 +12,46 @@ ...@@ -10,48 +12,46 @@
#include <map> #include <map>
#include <vector> #include <vector>
namespace YAML namespace YAML {
{ class EventHandler;
class EventHandler; class Node;
class Node;
class NodeEvents {
class NodeEvents public:
{ explicit NodeEvents(const Node& node);
public:
explicit NodeEvents(const Node& node); void Emit(EventHandler& handler);
void Emit(EventHandler& handler); private:
class AliasManager {
private: public:
class AliasManager { AliasManager() : m_curAnchor(0) {}
public:
AliasManager(): m_curAnchor(0) {} void RegisterReference(const detail::node& node);
anchor_t LookupAnchor(const detail::node& node) const;
void RegisterReference(const detail::node& node);
anchor_t LookupAnchor(const detail::node& node) const; private:
anchor_t _CreateNewAnchor() { return ++m_curAnchor; }
private:
anchor_t _CreateNewAnchor() { return ++m_curAnchor; }
private:
typedef std::map<const detail::node_ref*, anchor_t> AnchorByIdentity;
AnchorByIdentity m_anchorByIdentity;
anchor_t m_curAnchor;
};
void Setup(const detail::node& node);
void Emit(const detail::node& node, EventHandler& handler, AliasManager& am) const;
bool IsAliased(const detail::node& node) const;
private:
detail::shared_memory_holder m_pMemory;
detail::node* m_root;
typedef std::map<const detail::node_ref *, int> RefCount;
RefCount m_refCount;
};
}
#endif // NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 private:
typedef std::map<const detail::node_ref*, anchor_t> AnchorByIdentity;
AnchorByIdentity m_anchorByIdentity;
anchor_t m_curAnchor;
};
void Setup(const detail::node& node);
void Emit(const detail::node& node, EventHandler& handler,
AliasManager& am) const;
bool IsAliased(const detail::node& node) const;
private:
detail::shared_memory_holder m_pMemory;
detail::node* m_root;
typedef std::map<const detail::node_ref*, int> RefCount;
RefCount m_refCount;
};
}
#endif // NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
src/ostream_wrapper.cpp
...@@ -2,55 +2,52 @@ ...@@ -2,55 +2,52 @@
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
namespace YAML namespace YAML {
{ ostream_wrapper::ostream_wrapper()
ostream_wrapper::ostream_wrapper(): m_buffer(1), m_pStream(0), m_pos(0), m_row(0), m_col(0), m_comment(false) : m_buffer(1),
{ m_pStream(0),
} m_pos(0),
m_row(0),
ostream_wrapper::ostream_wrapper(std::ostream& stream): m_pStream(&stream), m_pos(0), m_row(0), m_col(0), m_comment(false) m_col(0),
{ m_comment(false) {}
}
ostream_wrapper::ostream_wrapper(std::ostream& stream)
ostream_wrapper::~ostream_wrapper() : m_pStream(&stream), m_pos(0), m_row(0), m_col(0), m_comment(false) {}
{
} ostream_wrapper::~ostream_wrapper() {}
void ostream_wrapper::write(const std::string& str) void ostream_wrapper::write(const std::string& str) {
{ if (m_pStream) {
if(m_pStream) { m_pStream->write(str.c_str(), str.size());
m_pStream->write(str.c_str(), str.size()); } else {
} else { m_buffer.resize(std::max(m_buffer.size(), m_pos + str.size() + 1));
m_buffer.resize(std::max(m_buffer.size(), m_pos + str.size() + 1)); std::copy(str.begin(), str.end(), &m_buffer[m_pos]);
std::copy(str.begin(), str.end(), &m_buffer[m_pos]); }
}
for (std::size_t i = 0; i < str.size(); i++)
for(std::size_t i=0;i<str.size();i++) update_pos(str[i]);
update_pos(str[i]); }
}
void ostream_wrapper::write(const char* str, std::size_t size) {
void ostream_wrapper::write(const char *str, std::size_t size) if (m_pStream) {
{ m_pStream->write(str, size);
if(m_pStream) { } else {
m_pStream->write(str, size); m_buffer.resize(std::max(m_buffer.size(), m_pos + size + 1));
} else { std::copy(str, str + size, &m_buffer[m_pos]);
m_buffer.resize(std::max(m_buffer.size(), m_pos + size + 1)); }
std::copy(str, str + size, &m_buffer[m_pos]);
} for (std::size_t i = 0; i < size; i++)
update_pos(str[i]);
for(std::size_t i=0;i<size;i++) }
update_pos(str[i]);
} void ostream_wrapper::update_pos(char ch) {
m_pos++;
void ostream_wrapper::update_pos(char ch) m_col++;
{
m_pos++; if (ch == '\n') {
m_col++; m_row++;
m_col = 0;
if(ch == '\n') { m_comment = false;
m_row++; }
m_col = 0; }
m_comment = false;
}
}
} }
src/parse.cpp
...@@ -7,62 +7,61 @@ ...@@ -7,62 +7,61 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
namespace YAML namespace YAML {
{ Node Load(const std::string& input) {
Node Load(const std::string& input) { std::stringstream stream(input);
std::stringstream stream(input); return Load(stream);
return Load(stream); }
}
Node Load(const char* input) {
Node Load(const char *input) { std::stringstream stream(input);
std::stringstream stream(input); return Load(stream);
return Load(stream); }
}
Node Load(std::istream& input) {
Node Load(std::istream& input) { Parser parser(input);
Parser parser(input); NodeBuilder builder;
NodeBuilder builder; if (!parser.HandleNextDocument(builder))
if(!parser.HandleNextDocument(builder)) return Node();
return Node();
return builder.Root();
}
Node LoadFile(const std::string& filename) { return builder.Root();
std::ifstream fin(filename.c_str()); }
if(!fin)
throw BadFile(); Node LoadFile(const std::string& filename) {
return Load(fin); std::ifstream fin(filename.c_str());
} if (!fin)
throw BadFile();
return Load(fin);
}
std::vector<Node> LoadAll(const std::string& input) { std::vector<Node> LoadAll(const std::string& input) {
std::stringstream stream(input); std::stringstream stream(input);
return LoadAll(stream); return LoadAll(stream);
} }
std::vector<Node> LoadAll(const char *input) {
std::stringstream stream(input);
return LoadAll(stream);
}
std::vector<Node> LoadAll(std::istream& input) {
std::vector<Node> docs;
Parser parser(input);
while(1) {
NodeBuilder builder;
if(!parser.HandleNextDocument(builder))
break;
docs.push_back(builder.Root());
}
return docs;
}
std::vector<Node> LoadAllFromFile(const std::string& filename) { std::vector<Node> LoadAll(const char* input) {
std::ifstream fin(filename.c_str()); std::stringstream stream(input);
if(!fin) return LoadAll(stream);
throw BadFile(); }
return LoadAll(fin);
} std::vector<Node> LoadAll(std::istream& input) {
std::vector<Node> docs;
Parser parser(input);
while (1) {
NodeBuilder builder;
if (!parser.HandleNextDocument(builder))
break;
docs.push_back(builder.Root());
}
return docs;
}
std::vector<Node> LoadAllFromFile(const std::string& filename) {
std::ifstream fin(filename.c_str());
if (!fin)
throw BadFile();
return LoadAll(fin);
}
} }
src/stream.cpp
...@@ -50,21 +50,21 @@ static bool s_introFinalState[] = {false, // uis_start ...@@ -50,21 +50,21 @@ static bool s_introFinalState[] = {false, // uis_start
false, // uis_utfbe_b1 false, // uis_utfbe_b1
false, // uis_utf32be_b2 false, // uis_utf32be_b2
false, // uis_utf32be_bom3 false, // uis_utf32be_bom3
true, // uis_utf32be true, // uis_utf32be
true, // uis_utf16be true, // uis_utf16be
false, // uis_utf16be_bom1 false, // uis_utf16be_bom1
false, // uis_utfle_bom1 false, // uis_utfle_bom1
false, // uis_utf16le_bom2 false, // uis_utf16le_bom2
false, // uis_utf32le_bom3 false, // uis_utf32le_bom3
true, // uis_utf16le true, // uis_utf16le
true, // uis_utf32le true, // uis_utf32le
false, // uis_utf8_imp false, // uis_utf8_imp
false, // uis_utf16le_imp false, // uis_utf16le_imp
false, // uis_utf32le_imp3 false, // uis_utf32le_imp3
false, // uis_utf8_bom1 false, // uis_utf8_bom1
false, // uis_utf8_bom2 false, // uis_utf8_bom2
true, // uis_utf8 true, // uis_utf8
true, // uis_error true, // uis_error
}; };
static UtfIntroState s_introTransitions[][uictMax] = { static UtfIntroState s_introTransitions[][uictMax] = {
......
test/new-api/parsertests.cpp
#include "parsertests.h" #include "parsertests.h"
namespace Test { namespace Test {
bool RunParserTests() bool RunParserTests() { return true; }
{
return true;
}
} }
test/nodetests.h
#ifndef NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #ifndef NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 #define NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 #if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once #pragma once
#endif #endif
namespace Test { namespace Test {
bool RunNodeTests(); bool RunNodeTests();
} }
#endif // NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A6666 #endif // NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A6666
test/tests.cpp
...@@ -9,25 +9,22 @@ ...@@ -9,25 +9,22 @@
#include <vector> #include <vector>
#include <iostream> #include <iostream>
namespace Test namespace Test {
{ void RunAll() {
void RunAll() bool passed = true;
{ if (!RunParserTests())
bool passed = true; passed = false;
if(!RunParserTests())
passed = false;
if(!RunEmitterTests())
passed = false;
if(!RunSpecTests()) if (!RunEmitterTests())
passed = false; passed = false;
if(!RunNodeTests()) if (!RunSpecTests())
passed = false; passed = false;
if(passed) if (!RunNodeTests())
std::cout << "All tests passed!\n"; passed = false;
}
}
if (passed)
std::cout << "All tests passed!\n";
}
}
util/parse.cpp
...@@ -5,56 +5,57 @@ ...@@ -5,56 +5,57 @@
#include <vector> #include <vector>
struct Params { struct Params {
bool hasFile; bool hasFile;
std::string fileName; std::string fileName;
}; };
Params ParseArgs(int argc, char **argv) { Params ParseArgs(int argc, char** argv) {
Params p; Params p;
std::vector<std::string> args(argv + 1, argv + argc); std::vector<std::string> args(argv + 1, argv + argc);
return p; return p;
} }
class NullEventHandler: public YAML::EventHandler class NullEventHandler : public YAML::EventHandler {
{ public:
public: virtual void OnDocumentStart(const YAML::Mark&) {}
virtual void OnDocumentStart(const YAML::Mark&) {} virtual void OnDocumentEnd() {}
virtual void OnDocumentEnd() {}
virtual void OnNull(const YAML::Mark&, YAML::anchor_t) {}
virtual void OnNull(const YAML::Mark&, YAML::anchor_t) {} virtual void OnAlias(const YAML::Mark&, YAML::anchor_t) {}
virtual void OnAlias(const YAML::Mark&, YAML::anchor_t) {} virtual void OnScalar(const YAML::Mark&, const std::string&, YAML::anchor_t,
virtual void OnScalar(const YAML::Mark&, const std::string&, YAML::anchor_t, const std::string&) {} const std::string&) {}
virtual void OnSequenceStart(const YAML::Mark&, const std::string&, YAML::anchor_t) {} virtual void OnSequenceStart(const YAML::Mark&, const std::string&,
virtual void OnSequenceEnd() {} YAML::anchor_t) {}
virtual void OnSequenceEnd() {}
virtual void OnMapStart(const YAML::Mark&, const std::string&, YAML::anchor_t) {}
virtual void OnMapEnd() {} virtual void OnMapStart(const YAML::Mark&, const std::string&,
YAML::anchor_t) {}
virtual void OnMapEnd() {}
}; };
void parse(std::istream& input) void parse(std::istream& input) {
{ try {
try { YAML::Node doc = YAML::Load(input);
YAML::Node doc = YAML::Load(input); std::cout << doc << "\n";
std::cout << doc << "\n"; }
} catch(const YAML::Exception& e) { catch (const YAML::Exception& e) {
std::cerr << e.what() << "\n"; std::cerr << e.what() << "\n";
} }
} }
int main(int argc, char **argv) int main(int argc, char** argv) {
{ Params p = ParseArgs(argc, argv);
Params p = ParseArgs(argc, argv);
if(argc > 1) { if (argc > 1) {
std::ifstream fin; std::ifstream fin;
fin.open(argv[1]); fin.open(argv[1]);
parse(fin); parse(fin);
} else { } else {
parse(std::cin); parse(std::cin);
} }
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment