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: fix #141; Merge branch 'issue-141'

Browse Source
This commit is contained in:
ToruNiina
2020-11-05 00:01:41 +09:00
parent b13065b1b5 9b472a6c72
commit be0d4bd0a9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toml/region.hpp
View File

@@ -344,7 +344,7 @@ struct region final : public region_base
{ {
// 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.empty() && str.back() == '\r') {str.pop_back();}
com.push_back(std::move(str)); com.push_back(std::move(str));
} }
else else
@@ -397,7 +397,7 @@ struct region final : public region_base
{ {
// unwrap the first '#' by std::next. // unwrap the first '#' by std::next.
auto str = make_string(std::next(comment_found), this->line_end()); auto str = make_string(std::next(comment_found), this->line_end());
if(str.back() == '\r') {str.pop_back();} if(!str.empty() && str.back() == '\r') {str.pop_back();}
com.push_back(std::move(str)); com.push_back(std::move(str));
} }
} }

11
toml/serializer.hpp
View File

@@ -122,7 +122,7 @@ struct serializer
std::snprintf(buf.data(), buf.size(), fmt, this->float_prec_, f); std::snprintf(buf.data(), buf.size(), fmt, this->float_prec_, f);
std::string token(buf.begin(), std::prev(buf.end())); std::string token(buf.begin(), std::prev(buf.end()));
if(token.back() == '.') // 1. => 1.0 if(!token.empty() && token.back() == '.') // 1. => 1.0
{ {
token += '0'; token += '0';
} }
@@ -304,7 +304,7 @@ struct serializer
token += '\n'; token += '\n';
} }
token += toml::visit(*this, item); token += toml::visit(*this, item);
if(token.back() == '\n') {token.pop_back();} if(!token.empty() && token.back() == '\n') {token.pop_back();}
token += ",\n"; token += ",\n";
continue; continue;
} }
@@ -312,7 +312,7 @@ struct serializer
next_elem += toml::visit(*this, item); next_elem += toml::visit(*this, item);
// comma before newline. // comma before newline.
if(next_elem.back() == '\n') {next_elem.pop_back();} if(!next_elem.empty() && next_elem.back() == '\n') {next_elem.pop_back();}
// if current line does not exceeds the width limit, continue. // if current line does not exceeds the width limit, continue.
if(current_line.size() + next_elem.size() + 1 < this->width_) if(current_line.size() + next_elem.size() + 1 < this->width_)
@@ -339,7 +339,10 @@ struct serializer
} }
if(!current_line.empty()) if(!current_line.empty())
{ {
if(current_line.back() != '\n') {current_line += '\n';} if(!current_line.empty() && current_line.back() != '\n')
{
current_line += '\n';
}
token += current_line; token += current_line;
} }
token += "]\n"; token += "]\n";