AuroraMiddleware/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2024-11-09 22:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify format_underline a bit

Browse Source
This commit is contained in:
ToruNiina 2019-06-01 19:06:08 +09:00
parent b8d3038d38
commit f04c97b587
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
toml/region.hpp
View File

@ -383,17 +383,11 @@ struct region final : public region_base
// to show a better error message. // to show a better error message.
inline std::string format_underline(const std::string& message, inline std::string format_underline(const std::string& message,
std::vector<std::pair<region_base const*, std::string>> reg_com, const std::vector<std::pair<region_base const*, std::string>>& reg_com,
std::vector<std::string> helps = {}) const std::vector<std::string>& helps = {})
{ {
assert(!reg_com.empty()); assert(!reg_com.empty());
#ifdef _WIN32
const auto newline = "\r\n";
#else
const char newline = '\n';
#endif
const auto line_num_width = std::max_element(reg_com.begin(), reg_com.end(), const auto line_num_width = std::max_element(reg_com.begin(), reg_com.end(),
[](std::pair<region_base const*, std::string> const& lhs, [](std::pair<region_base const*, std::string> const& lhs,
std::pair<region_base const*, std::string> const& rhs) std::pair<region_base const*, std::string> const& rhs)
@ -403,26 +397,26 @@ inline std::string format_underline(const std::string& message,
)->first->line_num().size(); )->first->line_num().size();
std::ostringstream retval; std::ostringstream retval;
retval << message << newline; retval << message << '\n';
for(std::size_t i=0; i<reg_com.size(); ++i) for(auto iter = reg_com.begin(); iter != reg_com.end(); ++iter)
{ {
if(i!=0 && reg_com.at(i-1).first->name() == reg_com.at(i).first->name()) // if the filenames are the same, print "..."
if(iter != reg_com.begin() &&
std::prev(iter)->first->name() == iter->first->name())
{ {
retval << newline << " ..." << newline; retval << "\n ...\n";
} }
else else // if filename differs, print " --> filename.toml"
{ {
if(i != 0) {retval << newline;} if(iter != reg_com.begin()) {retval << '\n';}
retval << " --> " << reg_com.at(i).first->name() << newline; retval << " --> " << iter->first->name() << '\n';
} }
const region_base* const reg = iter->first;
const region_base* const reg = reg_com.at(i).first; const std::string& comment = iter->second;
const std::string& comment = reg_com.at(i).second;
retval << ' ' << std::setw(line_num_width) << reg->line_num(); retval << ' ' << std::setw(line_num_width) << reg->line_num();
retval << " | " << reg->line() << newline; retval << " | " << reg->line() << '\n';
retval << make_string(line_num_width + 1, ' '); retval << make_string(line_num_width + 1, ' ');
retval << " | " << make_string(reg->before(), ' '); retval << " | " << make_string(reg->before(), ' ');
@ -440,20 +434,18 @@ inline std::string format_underline(const std::string& message,
const auto underline_len = std::min(reg->size(), reg->line().size()); const auto underline_len = std::min(reg->size(), reg->line().size());
retval << make_string(underline_len, '~'); retval << make_string(underline_len, '~');
} }
retval << ' '; retval << ' ';
retval << comment; retval << comment;
} }
if(helps.size() != 0) if(!helps.empty())
{ {
retval << newline; retval << '\n';
retval << make_string(line_num_width + 1, ' '); retval << make_string(line_num_width + 1, ' ');
retval << " | "; retval << " | ";
for(const auto help : helps) for(const auto help : helps)
{ {
retval << newline; retval << "\nHint: ";
retval << "Hint: ";
retval << help; retval << help;
} }
} }