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

fix: restore the back compat of format_error

Browse Source 
the following code was okay in the last release
```
toml::format_error("[test]", v, "test", {"hint1", "hint2"})
```
but was not okay in the current master. This commit fixes this.

cons: By this, the number of values to show is limited upto 3.
This commit is contained in:
ToruNiina
2019-03-20 20:46:22 +09:00
parent 4c13085b35
commit 5aebd6b562
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_format_error.cpp
View File

@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(test_1_value)
{ {
const std::string pretty_error = const std::string pretty_error =
toml::format_error("[error] test error", val, "this is a value", toml::format_error("[error] test error", val, "this is a value",
std::vector<std::string>{"this is a hint"}); {"this is a hint"});
std::cout << pretty_error << std::endl; std::cout << pretty_error << std::endl;
} }
} }
@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE(test_2_values)
toml::format_error("[error] test error with two values", toml::format_error("[error] test error with two values",
v1, "this is the answer", v1, "this is the answer",
v2, "this is the pi", v2, "this is the pi",
std::vector<std::string>{"hint"}); {"hint"});
std::cout << pretty_error << std::endl; std::cout << pretty_error << std::endl;
} }
} }
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(test_3_values)
v1, "this is the answer", v1, "this is the answer",
v2, "this is the pi", v2, "this is the pi",
v3, "this is a meta-syntactic variable", v3, "this is a meta-syntactic variable",
std::vector<std::string>{"hint 1", "hint 2"}); {"hint 1", "hint 2"});
std::cout << pretty_error << std::endl; std::cout << pretty_error << std::endl;
} }
} }

56
toml/value.hpp
View File

@@ -847,38 +847,40 @@ inline bool operator>=(const toml::value& lhs, const toml::value& rhs)
return !(lhs < rhs); return !(lhs < rhs);
} }
namespace detail inline std::string format_error(const std::string& err_msg,
{
inline std::string format_error_impl(const std::string& err_msg,
std::vector<std::pair<region_base const*, std::string>> val,
std::vector<std::string> hints)
{
return format_underline(err_msg, std::move(val), std::move(hints));
}
inline std::string format_error_impl(const std::string& err_msg,
std::vector<std::pair<region_base const*, std::string>> val)
{
return format_underline(err_msg, std::move(val));
}
template<typename ... Ts>
std::string format_error_impl(const std::string& err_msg,
std::vector<std::pair<region_base const*, std::string>> val,
const toml::value& v, const std::string& comment, const toml::value& v, const std::string& comment,
Ts&& ... args) std::vector<std::string> hints = {})
{ {
val.push_back(std::make_pair(std::addressof(get_region(v)), comment)); return detail::format_underline(err_msg,
return format_error_impl(err_msg, std::move(val), std::forward<Ts>(args)...); std::vector<std::pair<detail::region_base const*, std::string>>{
{std::addressof(detail::get_region(v)), comment}
}, std::move(hints));
} }
} // detail
template<typename ... Ts> inline std::string format_error(const std::string& err_msg,
std::string format_error(const std::string& err_msg, Ts&& ... args) const toml::value& v1, const std::string& comment1,
const toml::value& v2, const std::string& comment2,
std::vector<std::string> hints = {})
{ {
std::vector<std::pair<detail::region_base const*, std::string>> val; return detail::format_underline(err_msg,
val.reserve(sizeof...(args) / 2); std::vector<std::pair<detail::region_base const*, std::string>>{
return detail::format_error_impl(err_msg, std::move(val), {std::addressof(detail::get_region(v1)), comment1},
std::forward<Ts>(args)...); {std::addressof(detail::get_region(v2)), comment2}
}, std::move(hints));
}
inline std::string format_error(const std::string& err_msg,
const toml::value& v1, const std::string& comment1,
const toml::value& v2, const std::string& comment2,
const toml::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 Visitor> template<typename Visitor>