zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 19:10:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

return copied object from except

Browse Source 
having reference makes some technical difficulties.
This commit is contained in:
ToruNiina
2018-12-17 10:57:40 +09:00
parent 91ac2debce
commit 74fc70cfee
1 changed files with 8 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
toml/get.hpp
View File

@@ -480,52 +480,23 @@ auto get_or(toml::value&& v, const toml::key& ky, T&& opt)
// expect // expect
template<typename T> template<typename T>
auto expect(const toml::value& v) result<T, std::string> expect(const toml::value& v) noexcept
-> result<decltype(::toml::get<T>(v)), std::string>
{ {
try try
{ {
return ok(get<T>(v)); return ok(get<T>(v));
} }
catch(const type_error& te) catch(const std::exception& e)
{ {
return err(te.what()); return err(e.what());
} }
} }
template<typename T> template<typename T>
auto expect(toml::value& v) result<T, std::string> expect(const toml::value& v, const toml::key& k) noexcept
-> result<decltype(::toml::get<T>(v)), std::string>
{ {
try try
{ {
return ok(get<T>(v)); return ok(find<T>(v, k));
}
catch(const type_error& te)
{
return err(te.what());
}
}
template<typename T>
auto expect(toml::value&& v)
-> result<decltype(::toml::get<T>(std::move(v))), std::string>
{
try
{
return ok(get<T>(std::move(v)));
}
catch(const type_error& te)
{
return err(te.what());
}
}
template<typename T>
auto expect(const toml::value& v, const toml::key& k)
-> result<decltype(::toml::get<T>(v, k)), std::string>
{
try
{
return ok(get<T>(v, k));
} }
catch(const std::exception& e) catch(const std::exception& e)
{ {
@@ -533,65 +504,12 @@ auto expect(const toml::value& v, const toml::key& k)
} }
} }
template<typename T> template<typename T>
auto expect(toml::value& v, const toml::key& k) result<T, std::string> expect(const toml::table& t, const toml::key& k,
-> result<decltype(::toml::get<T>(v, k)), std::string> std::string tablename = "unknown table") noexcept
{ {
try try
{ {
return ok(get<T>(v, k)); return ok(find<T>(t, k, std::move(tablename)));
}
catch(const std::exception& e)
{
return err(e.what());
}
}
template<typename T>
auto expect(toml::value&& v, const toml::key& k)
-> result<decltype(::toml::get<T>(std::move(v), k)), std::string>
{
try
{
return ok(get<T>(std::move(v), k));
}
catch(const std::exception& e)
{
return err(e.what());
}
}
template<typename T>
auto expect(const toml::table& t, const toml::key& k, std::string tn)
-> result<decltype(::toml::get<T>(t, k, std::move(tn))), std::string>
{
try
{
return ok(get<T>(t, k, std::move(tn)));
}
catch(const std::exception& e)
{
return err(e.what());
}
}
template<typename T>
auto expect(toml::table& t, const toml::key& k, std::string tn)
-> result<decltype(::toml::get<T>(t, k, std::move(tn))), std::string>
{
try
{
return ok(get<T>(t, k, std::move(tn)));
}
catch(const std::exception& e)
{
return err(e.what());
}
}
template<typename T>
auto expect(toml::table&& t, const toml::key& k, std::string tn)
-> result<decltype(::toml::get<T>(std::move(t), k, std::move(tn))), std::string>
{
try
{
return ok(get<T>(std::move(t), k, std::move(tn)));
} }
catch(const std::exception& e) catch(const std::exception& e)
{ {