From e1fa4a088dd95caef22045f905a9d5d22b71bef0 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 24 Jan 2017 21:50:39 -0500 Subject: Whitespace changes --- generator/group.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'generator/group.cpp') diff --git a/generator/group.cpp b/generator/group.cpp index 334c2aa..cebe2b9 100644 --- a/generator/group.cpp +++ b/generator/group.cpp @@ -8,37 +8,37 @@ namespace verbly { namespace generator { - + int group::nextId_ = 0; - + group::group() : id_(nextId_++) { } - + void group::setParent(const group& parent) { // Adding a group to itself is nonsensical. assert(&parent != this); - + parent_ = &parent; } - + void group::addRole(role r) { std::string name = r.getName(); roles_[name] = std::move(r); roleNames_.insert(std::move(name)); } - + void group::addFrame(const frame& f) { frames_.insert(&f); } - + std::set group::getRoles() const { std::set fullRoles = roleNames_; - + if (hasParent()) { for (std::string name : getParent().getRoles()) @@ -46,10 +46,10 @@ namespace verbly { fullRoles.insert(name); } } - + return fullRoles; } - + const role& group::getRole(std::string name) const { if (roles_.count(name)) @@ -62,11 +62,11 @@ namespace verbly { throw std::invalid_argument("Specified role not found in verb group"); } } - + std::set group::getFrames() const { std::set fullFrames = frames_; - + if (hasParent()) { for (const frame* f : getParent().getFrames()) @@ -74,47 +74,47 @@ namespace verbly { fullFrames.insert(f); } } - + return fullFrames; } - + database& operator<<(database& db, const group& arg) { // Serialize the group first { std::list fields; fields.emplace_back("group_id", arg.getId()); - + nlohmann::json jsonRoles; for (std::string name : arg.getRoles()) { const role& r = arg.getRole(name); - + nlohmann::json jsonRole; jsonRole["type"] = name; jsonRole["selrestrs"] = r.getSelrestrs().toJson(); - + jsonRoles.emplace_back(std::move(jsonRole)); } fields.emplace_back("data", jsonRoles.dump()); - + db.insertIntoTable("groups", std::move(fields)); } - + // Then, serialize the group/frame relationship for (const frame* f : arg.getFrames()) { std::list fields; - + fields.emplace_back("group_id", arg.getId()); fields.emplace_back("frame_id", f->getId()); - + db.insertIntoTable("groups_frames", std::move(fields)); } - + return db; } - + }; }; -- cgit 1.4.1