From 4a58f0f37aae6381f74a6d94c2be66f54b8ae107 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 23 Jan 2017 11:14:02 -0500 Subject: Whitespace changes --- generator/frame.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/generator/frame.cpp b/generator/frame.cpp index 9f0653f..f75e3ba 100644 --- a/generator/frame.cpp +++ b/generator/frame.cpp @@ -4,29 +4,29 @@ namespace verbly { namespace generator { - + int frame::nextId_ = 0; - + frame::frame() : id_(nextId_++) { } - + void frame::push_back(part fp) { parts_.push_back(std::move(fp)); } - + database& operator<<(database& db, const frame& arg) { std::list fields; fields.emplace_back("frame_id", arg.getId()); - + nlohmann::json jsonParts; for (const part& p : arg) { nlohmann::json jsonPart; jsonPart["type"] = static_cast(p.getType()); - + switch (p.getType()) { case part::type::noun_phrase: @@ -34,50 +34,50 @@ namespace verbly { jsonPart["role"] = p.getNounRole(); jsonPart["selrestrs"] = p.getNounSelrestrs().toJson(); jsonPart["synrestrs"] = p.getNounSynrestrs(); - + break; } - + case part::type::preposition: { jsonPart["choices"] = p.getPrepositionChoices(); jsonPart["literal"] = p.isPrepositionLiteral(); - + break; } - + case part::type::literal: { jsonPart["value"] = p.getLiteralValue(); - + break; } - + case part::type::verb: case part::type::adjective: case part::type::adverb: { break; } - + case part::type::invalid: { // Invalid parts should not be serialized. assert(false); - + break; } } - - jsonParts.emplace_back(std::move(jsonPart)); + + jsonParts.push_back(std::move(jsonPart)); } fields.emplace_back("data", jsonParts.dump()); - + db.insertIntoTable("frames", std::move(fields)); - + return db; } - + }; }; -- cgit 1.4.1