Skip to content

support inline table #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dota17 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support inline table #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 67 additions & 5 deletions include/toml/toml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,20 @@ namespace toml {
class Value;
typedef std::chrono::system_clock::time_point Time;
typedef std::vector<Value> Array;
typedef std::map<std::string, Value> Table;

class Table : public std::map<std::string, Value> {
public:
inline void setInline(bool flag)
{
isInline_ = flag;
}
inline bool IsInline() const
{
return isInline_;
}
private:
bool isInline_ = false;
};

namespace internal {
template<typename T> struct call_traits_value {
Expand Down Expand Up @@ -156,6 +169,10 @@ class Value {
Value* setChild(const std::string& key, Value&& v);
bool eraseChild(const std::string& key);

//
void setInline(bool flag);
bool IsInline() const;

// ----------------------------------------------------------------------
// For Array value

Expand Down Expand Up @@ -1367,23 +1384,50 @@ inline void Value::write(std::ostream* os, const std::string& keyPrefix, int ind
(*os) << ']';
break;
case TABLE_TYPE:
for (const auto& kv : *table_) {
if (table_->IsInline()) {
(*os) << "{ ";
}
for (auto iter = table_->begin(); iter != table_->end(); ++iter) {
const auto& kv = *iter;
if (kv.second.is<Table>())
continue;
if (kv.second.is<Array>() && kv.second.size() > 0 && kv.second.find(0)->is<Table>())
continue;
(*os) << spaces(indent) << escapeKey(kv.first) << " = ";
kv.second.write(os, keyPrefix, indent >= 0 ? indent + 1 : indent);
(*os) << '\n';
if (table_->IsInline()) {
++iter;
if (iter != table_->end()) {
(*os) << ", ";
}
--iter;
} else {
(*os) << '\n';
}
}
for (const auto& kv : *table_) {
for (auto iter = table_->begin(); iter != table_->end(); ++iter) {
const auto& kv = *iter;
if (kv.second.is<Table>()) {
std::string key(keyPrefix);
if (!keyPrefix.empty())
key += ".";
key += escapeKey(kv.first);
(*os) << "\n" << spaces(indent) << "[" << key << "]\n";
if (kv.second.IsInline()) {
if (!table_->IsInline()) {
(*os) << "\n";
}
(*os) << escapeKey(kv.first) << " = ";
} else {
(*os) << "\n" << spaces(indent) << "[" << key << "]\n";
}
kv.second.write(os, key, indent >= 0 ? indent + 1 : indent);
if (table_->IsInline()) {
++iter;
if (iter != table_->end()) {
(*os) << ", ";
}
--iter;
}
}
if (kv.second.is<Array>() && kv.second.size() > 0 && kv.second.find(0)->is<Table>()) {
std::string key(keyPrefix);
Expand All @@ -1396,6 +1440,9 @@ inline void Value::write(std::ostream* os, const std::string& keyPrefix, int ind
}
}
}
if (table_->IsInline()) {
(*os) << " }";
}
break;
default:
failwith("writing unknown type");
Expand Down Expand Up @@ -1588,6 +1635,20 @@ inline bool Value::eraseChild(const std::string& key)
return table_->erase(key) > 0;
}

inline void Value::setInline(bool flag)
{
if (!is<Table>())
failwith("type must be table to do setInline(flag).");
table_->setInline(flag);
}

inline bool Value::IsInline() const
{
if(!is<Table>())
failwith("type must be table to do IsInline.");
return table_->IsInline();
}

inline Value& Value::operator[](const std::string& key)
{
if (!valid())
Expand Down Expand Up @@ -2040,6 +2101,7 @@ inline bool Parser::parseInlineTable(Value* value)

if (!consumeForValue(TokenType::RBRACE))
return false;
t.setInline(true);
*value = std::move(t);
return true;
}
Expand Down