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: avoid string construct in format_ul

Browse Source
This commit is contained in:
ToruNiina
2020-07-30 16:11:35 +09:00
parent f23c003d2f
commit 4e6ae9a994
1 changed files with 71 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
toml/source_location.hpp
View File

@@ -107,17 +107,20 @@ inline std::string format_underline(const std::string& message,
const std::vector<std::string>& helps = {},
const bool colorize = TOML11_ERROR_MESSAGE_COLORIZED)
{
assert(!loc_com.empty());
const auto line_num_width = static_cast<int>(std::to_string(std::max_element(
loc_com.begin(), loc_com.end(),
[](std::pair<source_location, std::string> const& lhs,
std::pair<source_location, std::string> const& rhs)
std::size_t line_num_width = 0;
for(const auto& lc : loc_com)
{
return std::to_string(lhs.first.line()).size() <
std::to_string(rhs.first.line()).size();
std::uint_least32_t line = lc.first.line();
std::size_t digit = 0;
while(line != 0)
{
line /= 10;
digit += 1;
}
)->first.line()).size());
line_num_width = (std::max)(line_num_width, digit);
}
// 1 is the minimum width
line_num_width = std::max<std::size_t>(line_num_width, 1);
std::ostringstream retval;
@@ -142,32 +145,16 @@ inline std::string format_underline(const std::string& message,
<< color::bold << message << color::reset << '\n';
}
for(auto iter = loc_com.begin(); iter != loc_com.end(); ++iter)
const auto format_one_location = [line_num_width]
(std::ostringstream& oss,
const source_location& loc, const std::string& comment) -> void
{
// if the filenames are the same, print "..."
if(iter != loc_com.begin() &&
std::prev(iter)->first.file_name() == iter->first.file_name())
{
retval << color::bold << color::blue << "\n ...\n" << color::reset;
}
else // if filename differs, print " --> filename.toml"
{
if(iter != loc_com.begin()) {retval << '\n';}
retval << color::bold << color::blue << " --> " << color::reset
<< iter->first.file_name() << '\n';
// add one almost-empty line for readability
retval << make_string(static_cast<std::size_t>(line_num_width + 1), ' ')
<< color::bold << color::blue << " | " << color::reset << '\n';
}
const source_location& loc = iter->first;
const std::string& comment = iter->second;
retval << ' ' << color::bold << color::blue << std::setw(line_num_width)
oss << ' ' << color::bold << color::blue
<< std::setw(static_cast<int>(line_num_width))
<< std::right << loc.line() << " | " << color::reset
<< loc.line_str() << '\n';
retval << make_string(static_cast<std::size_t>(line_num_width + 1), ' ')
oss << make_string(line_num_width + 1, ' ')
<< color::bold << color::blue << " | " << color::reset
<< make_string(loc.column()-1 /*1-origin*/, ' ');
@@ -175,7 +162,7 @@ inline std::string format_underline(const std::string& message,
{
// invalid
// ^------
retval << color::bold << color::red << "^---" << color::reset;
oss << color::bold << color::red << "^---" << color::reset;
}
else
{
@@ -183,17 +170,53 @@ inline std::string format_underline(const std::string& message,
// ~~~~~~~
const auto underline_len = (std::min)(
static_cast<std::size_t>(loc.region()), loc.line_str().size());
retval << color::bold << color::red
oss << color::bold << color::red
<< make_string(underline_len, '~') << color::reset;
}
retval << ' ';
retval << comment;
oss << ' ';
oss << comment;
return;
};
assert(!loc_com.empty());
// --> example.toml
// |
retval << color::bold << color::blue << " --> " << color::reset
<< loc_com.front().first.file_name() << '\n';
retval << make_string(line_num_width + 1, ' ')
<< color::bold << color::blue << " | " << color::reset << '\n';
// 1 | key value
// | ^--- missing =
format_one_location(retval, loc_com.front().first, loc_com.front().second);
// process the rest of the locations
for(std::size_t i=1; i<loc_com.size(); ++i)
{
const auto& prev = loc_com.at(i-1);
const auto& curr = loc_com.at(i);
retval << '\n';
// if the filenames are the same, print "..."
if(prev.first.file_name() == curr.first.file_name())
{
retval << color::bold << color::blue << " ...\n" << color::reset;
}
else // if filename differs, print " --> filename.toml" again
{
retval << color::bold << color::blue << " --> " << color::reset
<< curr.first.file_name() << '\n';
retval << make_string(line_num_width + 1, ' ')
<< color::bold << color::blue << " |\n" << color::reset;
}
format_one_location(retval, curr.first, curr.second);
}
if(!helps.empty())
{
retval << '\n';
retval << make_string(static_cast<std::size_t>(line_num_width + 1), ' ');
retval << make_string(line_num_width + 1, ' ');
retval << color::bold << color::blue << " | " << color::reset;
for(const auto& help : helps)
{