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

fix: avoid duplicating comment: array/table elems

Browse Source
This commit is contained in:
ToruNiina
2019-06-18 01:26:40 +09:00
parent 86e55c3bf7
commit 262f9c5fcc
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
toml/region.hpp
View File

@@ -304,38 +304,45 @@ struct region final : public region_base
// # this also. // # this also.
// a = value # not this. // a = value # not this.
// ``` // ```
auto iter = this->line_begin(); // points the first character
while(iter != this->begin()) // # this is a comment for `a`, not array elements.
// a = [1, 2, 3, 4, 5]
if(this->first() == std::find_if(this->line_begin(), this->first(),
[](const char c) noexcept -> bool {return c == '[' || c == '{';}))
{ {
iter = std::prev(iter); auto iter = this->line_begin(); // points the first character
while(iter != this->begin())
{
iter = std::prev(iter);
// range [line_start, iter) represents the previous line // range [line_start, iter) represents the previous line
const auto line_start = std::find( const auto line_start = std::find(
rev_iter(iter), rev_iter(this->begin()), '\n').base(); rev_iter(iter), rev_iter(this->begin()), '\n').base();
const auto comment_found = std::find(line_start, iter, '#'); const auto comment_found = std::find(line_start, iter, '#');
if(comment_found == iter) if(comment_found == iter)
{ {
break; // comment not found. break; // comment not found.
} }
// exclude the following case. // exclude the following case.
// > a = "foo" # comment // <-- this is not a comment for b but a. // > a = "foo" # comment // <-- this is not a comment for b but a.
// > b = "current value" // > b = "current value"
if(std::all_of(line_start, comment_found, if(std::all_of(line_start, comment_found,
[](const char c) noexcept -> bool { [](const char c) noexcept -> bool {
return c == ' ' || c == '\t'; return c == ' ' || c == '\t';
})) }))
{ {
// unwrap the first '#' by std::next. // unwrap the first '#' by std::next.
auto str = make_string(std::next(comment_found), iter); auto str = make_string(std::next(comment_found), iter);
if(str.back() == '\r') {str.pop_back();} if(str.back() == '\r') {str.pop_back();}
com.push_back(std::move(str)); com.push_back(std::move(str));
}
else
{
break;
}
iter = line_start;
} }
else
{
break;
}
iter = line_start;
} }
} }