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

remove format_error_for_value and add get_region instead

Browse Source 
it is convenient to have get_region function that can access region_info
in toml::value. get_region is placed in toml::detail and made friend of
toml::value because I don't want to make toml::value::region_info public
and keep it internal use only.
This commit is contained in:
ToruNiina
2018-12-13 16:13:05 +09:00
parent 06f04af375
commit acc7b7870f
3 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
toml/value.hpp
View File

@@ -17,8 +17,8 @@ namespace toml
namespace detail
{
std::string // forward decl
format_error_for_value(const value&, const std::string&, const std::string&);
// to show error messages. not recommended for users.
region_base const& get_region(const value&);
}// detail
template<typename T>
@@ -555,14 +555,8 @@ class value
}
}
std::string
format_error(const std::string& msg, const std::string& com) const
{
return detail::format_underline(msg, *(this->region_info_), com);
}
friend std::string detail::format_error_for_value(
const value&, const std::string&, const std::string&);
// for error messages
friend region_base const& detail::get_region(const value&);
template<value_t T>
struct switch_cast;
@@ -594,10 +588,9 @@ class value
namespace detail
{
inline std::string format_error_for_value(
const value& v, const std::string& m, const std::string& c)
inline region_base const& get_region(const value& v)
{
return v.format_error(m, c);
return *(v.region_info_);
}
}// detail
@@ -668,8 +661,8 @@ typename detail::toml_default_type<T>::type& value::cast() &
{
if(T != this->type_)
{
throw type_error(this->format_error(concat_to_string(
"[error] toml::value bad_cast to ", T),
throw type_error(format_underline(concat_to_string(
"[error] toml::value bad_cast to ", T), *region_info_,
concat_to_string("the actual type is ", this->type_)));
}
return switch_cast<T>::invoke(*this);
@@ -679,8 +672,8 @@ typename detail::toml_default_type<T>::type const& value::cast() const&
{
if(T != this->type_)
{
throw type_error(this->format_error(concat_to_string(
"[error] toml::value bad_cast to ", T),
throw type_error(format_underline(concat_to_string(
"[error] toml::value bad_cast to ", T), *region_info_,
concat_to_string("the actual type is ", this->type_)));
}
return switch_cast<T>::invoke(*this);
@@ -690,8 +683,8 @@ typename detail::toml_default_type<T>::type&& value::cast() &&
{
if(T != this->type_)
{
throw type_error(this->format_error(concat_to_string(
"[error] toml::value bad_cast to ", T),
throw type_error(format_underline(concat_to_string(
"[error] toml::value bad_cast to ", T), *region_info_,
concat_to_string("the actual type is ", this->type_)));
}
return switch_cast<T>::invoke(std::move(*this));