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

refactor: use serializer::is_array_of_tables

Browse Source
This commit is contained in:
ToruNiina
2020-10-14 22:27:29 +09:00
parent f7bfcdd7aa
commit 382e3dc3ab
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
toml/serializer.hpp
View File

@@ -248,13 +248,7 @@ struct serializer
{ {
return std::string("[]"); return std::string("[]");
} }
if(this->is_array_of_tables(v))
// Since TOML v0.5.0, heterogeneous arrays are allowed. So we need to
// check all the element in an array to check if the array is an array
// of tables.
const bool is_array_of_tables = std::all_of(v.begin(), v.end(),
[](const value_type& elem) {return elem.is_table();});
if(is_array_of_tables)
{ {
// if it's not inlined, we need to add `[[table.key]]`. // if it's not inlined, we need to add `[[table.key]]`.
// but if it can be inlined, // but if it can be inlined,
@@ -674,8 +668,16 @@ struct serializer
bool is_array_of_tables(const value_type& v) const bool is_array_of_tables(const value_type& v) const
{ {
if(!v.is_array()) {return false;} if(!v.is_array()) {return false;}
const auto& a = v.as_array(); return is_array_of_tables(v.as_array());
return !a.empty() && a.front().is_table(); }
bool is_array_of_tables(const array_type& v) const
{
// Since TOML v0.5.0, heterogeneous arrays are allowed. So we need to
// check all the element in an array to check if the array is an array
// of tables.
return std::all_of(v.begin(), v.end(), [](const value_type& elem) {
return elem.is_table();
});
} }
private: private: