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

change exception type #8; iterator may be invalid

Browse Source
This commit is contained in:
ToruNiina 2017-12-24 10:42:45 +09:00
parent 3f1b431ee2
commit 5aeb6f24df
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toml/parser.hpp
View File

@ -996,7 +996,7 @@ struct parse_data
if(iter == std::prev(end)) if(iter == std::prev(end))
{ {
if(data.count(*iter) == 1) if(data.count(*iter) == 1)
throw std::make_pair(iter, syntax_error("duplicate key: " + *iter)); throw syntax_error("duplicate key: " + *iter);
data.emplace(*iter, std::move(v)); data.emplace(*iter, std::move(v));
return; return;
} }
@ -1017,12 +1017,12 @@ struct parse_data
auto& ar = data[*iter].template cast<value_t::Array>(); auto& ar = data[*iter].template cast<value_t::Array>();
if(ar.empty()) ar.emplace_back(toml::Table{}); if(ar.empty()) ar.emplace_back(toml::Table{});
if(ar.back().type() != value_t::Table) if(ar.back().type() != value_t::Table)
throw std::make_pair(iter, syntax_error("assign table into array having non-table type: " + *iter)); throw syntax_error("assign table into array having non-table type: " + *iter);
return push_table(ar.back().template cast<value_t::Table>(), return push_table(ar.back().template cast<value_t::Table>(),
std::move(v), std::next(iter), end); std::move(v), std::next(iter), end);
} }
else else
throw std::make_pair(iter, syntax_error("assign table into not table: " + *iter)); throw syntax_error("assign table into not table: " + *iter);
} }
template<typename Iterator, class = typename std::enable_if< template<typename Iterator, class = typename std::enable_if<
@ -1032,12 +1032,13 @@ struct parse_data
push_array_of_table(toml::Table& data, toml::Table&& v, push_array_of_table(toml::Table& data, toml::Table&& v,
Iterator iter, Iterator end) Iterator iter, Iterator end)
{ {
//XXX Iterator::value_type == toml::key
if(iter == std::prev(end)) if(iter == std::prev(end))
{ {
if(data.count(*iter) == 0) if(data.count(*iter) == 0)
data.emplace(*iter, toml::Array()); data.emplace(*iter, toml::Array());
else if(data.at(*iter).type() != value_t::Array) else if(data.at(*iter).type() != value_t::Array)
throw std::make_pair(iter, syntax_error("duplicate key: " + *iter)); throw syntax_error("duplicate key: " + *iter);
data[*iter].template cast<value_t::Array>().emplace_back(std::move(v)); data[*iter].template cast<value_t::Array>().emplace_back(std::move(v));
return; return;
@ -1059,12 +1060,12 @@ struct parse_data
auto& ar = data[*iter].template cast<value_t::Array>(); auto& ar = data[*iter].template cast<value_t::Array>();
if(ar.empty()) ar.emplace_back(toml::Table{}); if(ar.empty()) ar.emplace_back(toml::Table{});
if(ar.back().type() != value_t::Table) if(ar.back().type() != value_t::Table)
throw std::make_pair(iter, syntax_error("assign table into array having non-table type: " + *iter)); throw syntax_error("assign table into array having non-table type: " + *iter);
return push_array_of_table(ar.back().template cast<value_t::Table>(), return push_array_of_table(ar.back().template cast<value_t::Table>(),
std::move(v), std::next(iter), end); std::move(v), std::next(iter), end);
} }
else else
throw std::make_pair(iter, syntax_error("assign array of table into not table: " + *iter)); throw syntax_error("assign array of table into not table: " + *iter);
} }
}; };