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

feat: update types in format_error

Browse Source
This commit is contained in:
ToruNiina
2019-06-02 21:50:27 +09:00
parent 89f0ace6ee
commit 319365f86b
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
toml/value.hpp
View File

@@ -1185,41 +1185,44 @@ inline bool operator>=(const basic_value<C, T, A>& lhs, const basic_value<C, T,
return !(lhs < rhs);
}
// inline std::string format_error(const std::string& err_msg,
// const toml::basic_value& v, const std::string& comment,
// std::vector<std::string> hints = {})
// {
// return detail::format_underline(err_msg,
// std::vector<std::pair<detail::region_base const*, std::string>>{
// {std::addressof(detail::get_region(v)), comment}
// }, std::move(hints));
// }
//
// inline std::string format_error(const std::string& err_msg,
// const toml::basic_value& v1, const std::string& comment1,
// const toml::basic_value& v2, const std::string& comment2,
// std::vector<std::string> hints = {})
// {
// return detail::format_underline(err_msg,
// std::vector<std::pair<detail::region_base const*, std::string>>{
// {std::addressof(detail::get_region(v1)), comment1},
// {std::addressof(detail::get_region(v2)), comment2}
// }, std::move(hints));
// }
//
// inline std::string format_error(const std::string& err_msg,
// const toml::basic_value& v1, const std::string& comment1,
// const toml::basic_value& v2, const std::string& comment2,
// const toml::basic_value& v3, const std::string& comment3,
// std::vector<std::string> hints = {})
// {
// return detail::format_underline(err_msg,
// std::vector<std::pair<detail::region_base const*, std::string>>{
// {std::addressof(detail::get_region(v1)), comment1},
// {std::addressof(detail::get_region(v2)), comment2},
// {std::addressof(detail::get_region(v3)), comment3}
// }, std::move(hints));
// }
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline std::string format_error(const std::string& err_msg,
const basic_value<C, T, A>& v, const std::string& comment,
std::vector<std::string> hints = {})
{
return detail::format_underline(err_msg,
std::vector<std::pair<detail::region_base const*, std::string>>{
{std::addressof(detail::get_region(v)), comment}
}, std::move(hints));
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline std::string format_error(const std::string& err_msg,
const toml::basic_value<C, T, A>& v1, const std::string& comment1,
const toml::basic_value<C, T, A>& v2, const std::string& comment2,
std::vector<std::string> hints = {})
{
return detail::format_underline(err_msg,
std::vector<std::pair<detail::region_base const*, std::string>>{
{std::addressof(detail::get_region(v1)), comment1},
{std::addressof(detail::get_region(v2)), comment2}
}, std::move(hints));
}
template<typename C, template<typename ...> class T, template<typename ...> class A>
inline std::string format_error(const std::string& err_msg,
const toml::basic_value<C, T, A>& v1, const std::string& comment1,
const toml::basic_value<C, T, A>& v2, const std::string& comment2,
const toml::basic_value<C, T, A>& v3, const std::string& comment3,
std::vector<std::string> hints = {})
{
return detail::format_underline(err_msg,
std::vector<std::pair<detail::region_base const*, std::string>>{
{std::addressof(detail::get_region(v1)), comment1},
{std::addressof(detail::get_region(v2)), comment2},
{std::addressof(detail::get_region(v3)), comment3}
}, std::move(hints));
}
template<typename Visitor, typename C,
template<typename ...> class T, template<typename ...> class A>