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/part.cpp | 134 ++++++++++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'generator/part.cpp') diff --git a/generator/part.cpp b/generator/part.cpp index b69ec65..8a75ed4 100644 --- a/generator/part.cpp +++ b/generator/part.cpp @@ -3,56 +3,56 @@ namespace verbly { namespace generator { - + part part::createNounPhrase(std::string role, selrestr selrestrs, std::set synrestrs) { part p(type::noun_phrase); - + new(&p.noun_phrase_.role) std::string(std::move(role)); new(&p.noun_phrase_.selrestrs) selrestr(std::move(selrestrs)); new(&p.noun_phrase_.synrestrs) std::set(std::move(synrestrs)); - + return p; } - + part part::createVerb() { return part(type::verb); } - + part part::createPreposition(std::set choices, bool literal) { part p(type::preposition); - + new(&p.preposition_.choices) std::set(std::move(choices)); p.preposition_.literal = literal; - + return p; } - + part part::createAdjective() { return part(type::adjective); } - + part part::createAdverb() { return part(type::adverb); } - + part part::createLiteral(std::string value) { part p(type::literal); - + new(&p.literal_) std::string(std::move(value)); - + return p; } - + part::part(const part& other) { type_ = other.type_; - + switch (type_) { case type::noun_phrase: @@ -60,25 +60,25 @@ namespace verbly { new(&noun_phrase_.role) std::string(other.noun_phrase_.role); new(&noun_phrase_.selrestrs) selrestr(other.noun_phrase_.selrestrs); new(&noun_phrase_.synrestrs) std::set(other.noun_phrase_.synrestrs); - + break; } - + case type::preposition: { new(&preposition_.choices) std::set(other.preposition_.choices); preposition_.literal = other.preposition_.literal; - + break; } - + case type::literal: { new(&literal_) std::string(other.literal_); - + break; } - + case type::verb: case type::adjective: case type::adverb: @@ -88,23 +88,23 @@ namespace verbly { } } } - + part::part(part&& other) : part() { swap(*this, other); } - + part& part::operator=(part other) { swap(*this, other); - + return *this; } - + void swap(part& first, part& second) { using type = part::type; - + type tempType = first.type_; std::string tempRole; selrestr tempSelrestrs; @@ -112,7 +112,7 @@ namespace verbly { std::set tempChoices; bool tempPrepLiteral; std::string tempLiteralValue; - + switch (tempType) { case type::noun_phrase: @@ -120,25 +120,25 @@ namespace verbly { tempRole = std::move(first.noun_phrase_.role); tempSelrestrs = std::move(first.noun_phrase_.selrestrs); tempSynrestrs = std::move(first.noun_phrase_.synrestrs); - + break; } - + case type::preposition: { tempChoices = std::move(first.preposition_.choices); tempPrepLiteral = first.preposition_.literal; - + break; } - + case type::literal: { tempLiteralValue = std::move(first.literal_); - + break; } - + case type::verb: case type::adjective: case type::adverb: @@ -147,11 +147,11 @@ namespace verbly { break; } } - + first.~part(); - + first.type_ = second.type_; - + switch (first.type_) { case type::noun_phrase: @@ -159,25 +159,25 @@ namespace verbly { new(&first.noun_phrase_.role) std::string(std::move(second.noun_phrase_.role)); new(&first.noun_phrase_.selrestrs) selrestr(std::move(second.noun_phrase_.selrestrs)); new(&first.noun_phrase_.synrestrs) std::set(std::move(second.noun_phrase_.synrestrs)); - + break; } - + case type::preposition: { new(&first.preposition_.choices) std::set(std::move(second.preposition_.choices)); first.preposition_.literal = second.preposition_.literal; - + break; } - + case type::literal: { new(&first.literal_) std::string(std::move(second.literal_)); - + break; } - + case type::verb: case type::adjective: case type::adverb: @@ -186,11 +186,11 @@ namespace verbly { break; } } - + second.~part(); - + second.type_ = tempType; - + switch (second.type_) { case type::noun_phrase: @@ -198,25 +198,25 @@ namespace verbly { new(&second.noun_phrase_.role) std::string(std::move(tempRole)); new(&second.noun_phrase_.selrestrs) selrestr(std::move(tempSelrestrs)); new(&second.noun_phrase_.synrestrs) std::set(std::move(tempSynrestrs)); - + break; } - + case type::preposition: { new(&second.preposition_.choices) std::set(std::move(tempChoices)); second.preposition_.literal = tempPrepLiteral; - + break; } - + case type::literal: { new(&second.literal_) std::string(std::move(tempLiteralValue)); - + break; } - + case type::verb: case type::adjective: case type::adverb: @@ -226,7 +226,7 @@ namespace verbly { } } } - + part::~part() { switch (type_) @@ -235,32 +235,32 @@ namespace verbly { { using string_type = std::string; using set_type = std::set; - + noun_phrase_.role.~string_type(); noun_phrase_.selrestrs.~selrestr(); noun_phrase_.synrestrs.~set_type(); - + break; } - + case type::preposition: { using set_type = std::set; - + preposition_.choices.~set_type(); - + break; } - + case type::literal: { using string_type = std::string; - + literal_.~string_type(); - + break; } - + case type::verb: case type::adjective: case type::adverb: @@ -270,7 +270,7 @@ namespace verbly { } } } - + std::string part::getNounRole() const { if (type_ == type::noun_phrase) @@ -280,7 +280,7 @@ namespace verbly { throw std::domain_error("part::getNounRole is only valid for noun phrase parts"); } } - + selrestr part::getNounSelrestrs() const { if (type_ == type::noun_phrase) @@ -290,7 +290,7 @@ namespace verbly { throw std::domain_error("part::getNounSelrestrs is only valid for noun phrase parts"); } } - + std::set part::getNounSynrestrs() const { if (type_ == type::noun_phrase) @@ -300,7 +300,7 @@ namespace verbly { throw std::domain_error("part::getNounSynrestrs is only valid for noun phrase parts"); } } - + std::set part::getPrepositionChoices() const { if (type_ == type::preposition) @@ -310,7 +310,7 @@ namespace verbly { throw std::domain_error("part::getPrepositionChoices is only valid for preposition parts"); } } - + bool part::isPrepositionLiteral() const { if (type_ == type::preposition) @@ -320,7 +320,7 @@ namespace verbly { throw std::domain_error("part::isPrepositionLiteral is only valid for preposition parts"); } } - + std::string part::getLiteralValue() const { if (type_ == type::literal) @@ -330,6 +330,6 @@ namespace verbly { throw std::domain_error("part::getLiteralValue is only valid for literal parts"); } } - + }; }; -- cgit 1.4.1