add from_toml and get function

This commit is contained in:
ToruNiina 2017-04-20 12:49:36 +09:00
parent fd8753612a
commit 1b2b422ea1
3 changed files with 223 additions and 6 deletions

View File

@ -2,6 +2,7 @@ set(TEST_NAMES
test_traits
test_value
test_to_toml
test_from_toml
)
add_definitions("-Wall -Wpedantic")

129
tests/test_from_toml.cpp Normal file
View File

@ -0,0 +1,129 @@
#define BOOST_TEST_MODULE "test_from_toml"
#ifdef UNITTEST_FRAMEWORK_LIBRARY_EXIST
#include <boost/test/unit_test.hpp>
#else
#define BOOST_TEST_NO_LIB
#include <boost/test/included/unit_test.hpp>
#endif
#include <toml/toml.hpp>
#include <map>
#include <unordered_map>
#include <list>
#include <deque>
BOOST_AUTO_TEST_CASE(test_from_toml_exact)
{
toml::Boolean b(true);
toml::Integer i(42);
toml::Float f(3.14);
toml::String s("hoge");
toml::Datetime d(std::chrono::system_clock::now());
toml::Array a;
a.emplace_back(2);
a.emplace_back(7);
a.emplace_back(1);
a.emplace_back(8);
a.emplace_back(2);
toml::Table t;
t.emplace("val1", true);
t.emplace("val2", 42);
t.emplace("val3", 3.14);
t.emplace("val4", "piyo");
toml::value v1(b);
toml::value v2(i);
toml::value v3(f);
toml::value v4(s);
toml::value v5(d);
toml::value v6(a);
toml::value v7(t);
toml::Boolean u1;
toml::Integer u2;
toml::Float u3;
toml::String u4;
toml::Datetime u5;
toml::Array u6;
toml::Table u7;
toml::from_toml(u1, v1);
toml::from_toml(u2, v2);
toml::from_toml(u3, v3);
toml::from_toml(u4, v4);
toml::from_toml(u5, v5);
toml::from_toml(u6, v6);
toml::from_toml(u7, v7);
BOOST_CHECK_EQUAL(u1, b);
BOOST_CHECK_EQUAL(u2, i);
BOOST_CHECK_EQUAL(u3, f);
BOOST_CHECK_EQUAL(u4, s);
BOOST_CHECK_EQUAL(u6.at(0).cast<toml::value_t::Integer>(), a.at(0).cast<toml::value_t::Integer>());
BOOST_CHECK_EQUAL(u6.at(1).cast<toml::value_t::Integer>(), a.at(1).cast<toml::value_t::Integer>());
BOOST_CHECK_EQUAL(u6.at(2).cast<toml::value_t::Integer>(), a.at(2).cast<toml::value_t::Integer>());
BOOST_CHECK_EQUAL(u6.at(3).cast<toml::value_t::Integer>(), a.at(3).cast<toml::value_t::Integer>());
BOOST_CHECK_EQUAL(u6.at(4).cast<toml::value_t::Integer>(), a.at(4).cast<toml::value_t::Integer>());
}
BOOST_AUTO_TEST_CASE(test_from_toml_cast)
{
toml::Integer i(42);
toml::Float f(3.14);
toml::Array a;
a.emplace_back(2);
a.emplace_back(7);
a.emplace_back(1);
a.emplace_back(8);
a.emplace_back(2);
toml::Table t;
t.emplace("val1", true);
t.emplace("val2", 42);
t.emplace("val3", 3.14);
t.emplace("val4", "piyo");
toml::value vi(i);
toml::value vf(f);
toml::value va(a);
toml::value vt(t);
int u1;
std::size_t u2;
float u3;
std::list<int> u4;
std::deque<std::size_t> u5;
std::map<std::string, toml::value> u6;
std::list<int> expect_list;
expect_list.push_back(2);
expect_list.push_back(7);
expect_list.push_back(1);
expect_list.push_back(8);
expect_list.push_back(2);
toml::from_toml(u1, vi);
toml::from_toml(u2, vi);
toml::from_toml(u3, vf);
toml::from_toml(u4, va);
toml::from_toml(u5, va);
toml::from_toml(u6, vt);
BOOST_CHECK_EQUAL(u1, 42);
BOOST_CHECK_EQUAL(u2, 42ul);
BOOST_CHECK_CLOSE_FRACTION(u3, 3.14, 1e-3);
bool same_list = (u4 == expect_list);
BOOST_CHECK(same_list);
BOOST_CHECK_EQUAL(u5.at(0), 2);
BOOST_CHECK_EQUAL(u5.at(1), 7);
BOOST_CHECK_EQUAL(u5.at(2), 1);
BOOST_CHECK_EQUAL(u5.at(3), 8);
BOOST_CHECK_EQUAL(u5.at(4), 2);
BOOST_CHECK_EQUAL(u6["val1"].cast<toml::value_t::Boolean>(), true);
BOOST_CHECK_EQUAL(u6["val2"].cast<toml::value_t::Integer>(), 42);
BOOST_CHECK_CLOSE_FRACTION(u6["val3"].cast<toml::value_t::Float>(), 3.14, 1e-3);
BOOST_CHECK_EQUAL(u6["val4"].cast<toml::value_t::String >(), "piyo");
}

View File

@ -82,7 +82,7 @@ operator<<(std::basic_ostream<charT, traits>& os, value_t t)
}
}
template<typename charT, typename traits = std::char_traits<charT>,
template<typename charT = char, typename traits = std::char_traits<charT>,
typename alloc = std::allocator<charT>>
inline std::basic_string<charT, traits, alloc>
stringize(value_t t)
@ -735,8 +735,8 @@ inline typename detail::toml_default_type<T>::type const&
value::cast() const
{
if(T != this->type_)
throw type_error("current type: " + stringize<char>(this->type_) +
std::string(" is not query type: ") + stringize<char>(T));
throw type_error("current type: " + stringize(this->type_) +
std::string(" is not query type: ") + stringize(T));
return switch_cast<T>::invoke(*this);
}
template<value_t T>
@ -744,12 +744,12 @@ inline typename detail::toml_default_type<T>::type&
value::cast()
{
if(T != this->type_)
throw type_error("current type: " + stringize<char>(this->type_) +
std::string(" is not query type: ") + stringize<char>(T));
throw type_error("current type: " + stringize(this->type_) +
std::string(" is not query type: ") + stringize(T));
return switch_cast<T>::invoke(*this);
}
/* -------------------------------------------------------------------------- */
/* ------------------------------- to_toml ---------------------------------- */
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT != toml::value_t::Unknown &&
@ -794,5 +794,92 @@ to_toml(std::initializer_list<std::pair<std::string, toml::value>> init)
return toml::value(std::move(init));
}
/* ------------------------------ from_toml --------------------------------- */
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT != toml::value_t::Unknown &&
vT != value_t::Empty), std::nullptr_t>::type = nullptr>
void from_toml(T& x, const toml::value& v)
{
if(v.type() != vT)
throw type_error("from_toml: value type: " + stringize(v.type()) +
std::string(" is not type of arguemnt: ") + stringize(vT));
x = v.cast<vT>();
return;
}
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT == toml::value_t::Unknown) &&
(!toml::detail::is_map<T>::value) &&
toml::detail::is_container<T>::value, std::nullptr_t>::type = nullptr>
void from_toml(T& x, const toml::value& v)
{
// TODO the case of x is not dynamic container case
if(v.type() != value_t::Array)
throw type_error("from_toml: value type: " + stringize(v.type()) +
std::string(" is not type of argument type Array"));
const auto& ar = v.cast<value_t::Array>();
for(const auto& val : ar)
{
typename T::value_type v;
from_toml(v, val);
x.push_back(std::move(v));
}
return;
}
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT == toml::value_t::Unknown) &&
toml::detail::is_map<T>::value, std::nullptr_t>::type = nullptr>
void from_toml(T& x, const toml::value& v)
{
if(v.type() != value_t::Table)
throw type_error("from_toml: value type: " + stringize(v.type()) +
std::string(" is not type of argument type Table"));
x.clear();
const auto& tb = v.cast<value_t::Table>();
for(const auto& kv : tb)
{
x.insert(kv);
}
return;
}
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT != toml::value_t::Unknown &&
vT != value_t::Empty), std::nullptr_t>::type = nullptr>
inline T get(const toml::value& v)
{
return static_cast<T>(v.cast<vT>());
}
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT == toml::value_t::Unknown) &&
(!toml::detail::is_map<T>::value) &&
toml::detail::is_container<T>::value, std::nullptr_t>::type = nullptr>
T get(const toml::value& v)
{
if(v.type() != value_t::Array)
throw type_error("from_toml: value type: " + stringize(v.type()) +
std::string(" is not type of argument type Array"));
T tmp;
from_toml(tmp, v);
return tmp;
}
template<typename T, toml::value_t vT = toml::detail::check_type<T>(),
typename std::enable_if<(vT == toml::value_t::Unknown) &&
toml::detail::is_map<T>::value, std::nullptr_t>::type = nullptr>
T get(const toml::value& v)
{
if(v.type() != value_t::Table)
throw type_error("from_toml: value type: " + stringize(v.type()) +
std::string(" is not type of argument type Table"));
T tmp;
from_toml(tmp, v);
return tmp;
}
}// toml
#endif// TOML_FOR_MODERN_CPP