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

fix array_of_table assignments

Browse Source
This commit is contained in:
ToruNiina
2017-05-12 22:28:49 +09:00
parent 96429e3e08
commit f52b78010c
2 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
toml/parser.hpp
View File

@@ -944,12 +944,27 @@ struct parse_data
}
if(data.count(*iter) == 0)
{
data.emplace(*iter, toml::Table());
else if(data[*iter].type() != value_t::Table)
throw syntax_error("duplicate key: " + *iter);
return push_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
return push_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else if(data[*iter].type() == value_t::Table)
{
return push_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else if(data[*iter].type() == value_t::Array)
{
auto& ar = data[*iter].template cast<value_t::Array>();
if(ar.empty()) ar.emplace_back(toml::Table{});
if(ar.back().type() != value_t::Table)
throw syntax_error("assign table into array having non-table type: " + *iter);
return push_table(ar.back().template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else
throw syntax_error("assign table into not table: " + *iter);
}
template<typename Iterator, class = typename std::enable_if<
@@ -971,12 +986,27 @@ struct parse_data
}
if(data.count(*iter) == 0)
{
data.emplace(*iter, toml::Table());
else if(data[*iter].type() != value_t::Table)
throw syntax_error("duplicate key: " + *iter);
return push_array_of_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
return push_array_of_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else if(data[*iter].type() == value_t::Table)
{
return push_array_of_table(data[*iter].template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else if(data[*iter].type() == value_t::Array)
{
auto& ar = data[*iter].template cast<value_t::Array>();
if(ar.empty()) ar.emplace_back(toml::Table{});
if(ar.back().type() != value_t::Table)
throw syntax_error("assign table into array having non-table type: " + *iter);
return push_array_of_table(ar.back().template cast<value_t::Table>(),
std::move(v), std::next(iter), end);
}
else
throw syntax_error("assign array of table into not table: " + *iter);
}
};