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

refactor: use as_xxx to cast toml value

Browse Source 
and store rvalue reference as a value instead of lvalue
This commit is contained in:
ToruNiina
2019-08-31 18:22:36 +09:00
parent 43907de365
commit 4cebd660fd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
toml/find.hpp
View File

@@ -41,7 +41,7 @@ template<typename C,
template<typename ...> class M, template<typename ...> class V> template<typename ...> class M, template<typename ...> class V>
basic_value<C, M, V>&& find(basic_value<C, M, V>&& v, const key& ky) basic_value<C, M, V>&& find(basic_value<C, M, V>&& v, const key& ky)
{ {
auto& tab = v.template cast<value_t::table>(); auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) if(tab.count(ky) == 0)
{ {
throw std::out_of_range(detail::format_underline(concat_to_string( throw std::out_of_range(detail::format_underline(concat_to_string(
@@ -60,7 +60,7 @@ template<typename T, typename C,
decltype(::toml::get<T>(std::declval<basic_value<C, M, V> const&>())) decltype(::toml::get<T>(std::declval<basic_value<C, M, V> const&>()))
find(const basic_value<C, M, V>& v, const key& ky) find(const basic_value<C, M, V>& v, const key& ky)
{ {
const auto& tab = v.template cast<value_t::table>(); const auto& tab = v.as_table();
if(tab.count(ky) == 0) if(tab.count(ky) == 0)
{ {
throw std::out_of_range(detail::format_underline(concat_to_string( throw std::out_of_range(detail::format_underline(concat_to_string(
@@ -76,7 +76,7 @@ template<typename T, typename C,
decltype(::toml::get<T>(std::declval<basic_value<C, M, V>&>())) decltype(::toml::get<T>(std::declval<basic_value<C, M, V>&>()))
find(basic_value<C, M, V>& v, const key& ky) find(basic_value<C, M, V>& v, const key& ky)
{ {
auto& tab = v.template cast<value_t::table>(); auto& tab = v.as_table();
if(tab.count(ky) == 0) if(tab.count(ky) == 0)
{ {
throw std::out_of_range(detail::format_underline(concat_to_string( throw std::out_of_range(detail::format_underline(concat_to_string(
@@ -92,7 +92,7 @@ template<typename T, typename C,
decltype(::toml::get<T>(std::declval<basic_value<C, M, V>&&>())) decltype(::toml::get<T>(std::declval<basic_value<C, M, V>&&>()))
find(basic_value<C, M, V>&& v, const key& ky) find(basic_value<C, M, V>&& v, const key& ky)
{ {
auto& tab = v.template cast<value_t::table>(); auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) if(tab.count(ky) == 0)
{ {
throw std::out_of_range(detail::format_underline(concat_to_string( throw std::out_of_range(detail::format_underline(concat_to_string(
@@ -193,9 +193,9 @@ template<typename C,
basic_value<C, M, V> basic_value<C, M, V>
find_or(basic_value<C, M, V>&& v, const toml::key& ky, basic_value<C, M, V>&& opt) find_or(basic_value<C, M, V>&& v, const toml::key& ky, basic_value<C, M, V>&& opt)
{ {
if(!v.is_table()) {return opt;} if(!v.is_table()) {return std::move(opt);}
auto tab = std::move(v).as_table(); auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) {return opt;} if(tab.count(ky) == 0) {return std::move(opt);}
return std::move(tab[ky]); return std::move(tab[ky]);
} }
@@ -231,9 +231,9 @@ detail::enable_if_t<
detail::is_exact_toml_type<T, basic_value<C, M, V>>::value, T>&& detail::is_exact_toml_type<T, basic_value<C, M, V>>::value, T>&&
find_or(basic_value<C, M, V>&& v, const toml::key& ky, T&& opt) find_or(basic_value<C, M, V>&& v, const toml::key& ky, T&& opt)
{ {
if(!v.is_table()) {return opt;} if(!v.is_table()) {return std::forward<T>(opt);}
auto tab = std::move(v).as_table(); auto tab = std::move(v).as_table();
if(tab.count(ky) == 0) {return opt;} if(tab.count(ky) == 0) {return std::forward<T>(opt);}
return get_or(std::move(tab[ky]), std::forward<T>(opt)); return get_or(std::move(tab[ky]), std::forward<T>(opt));
} }