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

fix: correct the order and remove last CR

Browse Source
This commit is contained in:
ToruNiina
2019-06-15 17:11:49 +09:00
parent eb4eca86db
commit 558349170d
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
toml/region.hpp
View File

@@ -309,6 +309,7 @@ struct region final : public region_base
{ {
iter = std::prev(iter); 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();
@@ -327,7 +328,9 @@ struct region final : public region_base
})) }))
{ {
// unwrap the first '#' by std::next. // unwrap the first '#' by std::next.
com.push_back(make_string(std::next(comment_found), iter)); auto str = make_string(std::next(comment_found), iter);
if(str.back() == '\r') {str.pop_back();}
com.push_back(std::move(str));
} }
else else
{ {
@@ -336,6 +339,12 @@ struct region final : public region_base
iter = line_start; iter = line_start;
} }
} }
if(com.size() > 1)
{
std::reverse(com.begin(), com.end());
}
{ {
// find comments just after the current region. // find comments just after the current region.
// ```toml // ```toml
@@ -359,11 +368,14 @@ struct region final : public region_base
// 3.14 # do this if you need a comment here. // 3.14 # do this if you need a comment here.
// ] // ]
// ``` // ```
const auto last_comment_found = const auto comment_found =
std::find(this->last(), this->line_end(), '#'); std::find(this->last(), this->line_end(), '#');
if(last_comment_found != this->line_end()) // '#' found if(comment_found != this->line_end()) // '#' found
{ {
com.push_back(make_string(last_comment_found, this->line_end())); // unwrap the first '#' by std::next.
auto str = make_string(std::next(comment_found), this->line_end());
if(str.back() == '\r') {str.pop_back();}
com.push_back(std::move(str));
} }
} }
return com; return com;