From 25e7891573468bd9c04605d7407b703a47f34199 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 26 Jun 2018 00:10:44 +0200 Subject: [PATCH] Apply clang-format --- generator/binaryserializationcodegenerator.cpp | 9 +++++---- generator/jsonserializationcodegenerator.cpp | 3 +-- generator/main.cpp | 2 +- generator/serializationcodegenerator.cpp | 6 ++++-- generator/serializationcodegenerator.h | 4 +--- generator/tests/morestructs.h | 2 +- generator/tests/structs.h | 4 ++-- lib/binary/reflector-boosthana.h | 18 +++++++----------- lib/binary/serializable.h | 3 +-- 9 files changed, 23 insertions(+), 28 deletions(-) diff --git a/generator/binaryserializationcodegenerator.cpp b/generator/binaryserializationcodegenerator.cpp index b90cd36..b5cfeec 100644 --- a/generator/binaryserializationcodegenerator.cpp +++ b/generator/binaryserializationcodegenerator.cpp @@ -45,8 +45,7 @@ string BinarySerializationCodeGenerator::qualifiedNameIfRelevant(clang::CXXRecor return qualifiedName; case IsRelevant::No: return string(); - default: - ; + default:; } // consider all classes specified via "--additional-classes" argument relevant @@ -119,7 +118,8 @@ void BinarySerializationCodeGenerator::generate(ostream &os) const // print writeCustomType method os << "template <> " << visibility << " void writeCustomType<::" << relevantClass.qualifiedName - << ">(BinarySerializer &serializer, const ::" << relevantClass.qualifiedName << " &customObject)\n{\n" + << ">(BinarySerializer &serializer, const ::" << relevantClass.qualifiedName + << " &customObject)\n{\n" " // write base classes\n"; for (const RelevantClass *baseClass : relevantBases) { os << " serializer.write(static_castqualifiedName << " &>(customObject));\n"; @@ -139,7 +139,8 @@ void BinarySerializationCodeGenerator::generate(ostream &os) const // print readCustomType method os << "template <> " << visibility << " void readCustomType<::" << relevantClass.qualifiedName - << ">(BinaryDeserializer &deserializer, ::" << relevantClass.qualifiedName << " &customObject)\n{\n" + << ">(BinaryDeserializer &deserializer, ::" << relevantClass.qualifiedName + << " &customObject)\n{\n" " // read base classes\n"; for (const RelevantClass *baseClass : relevantBases) { os << " deserializer.read(static_cast<::" << baseClass->qualifiedName << " &>(customObject));\n"; diff --git a/generator/jsonserializationcodegenerator.cpp b/generator/jsonserializationcodegenerator.cpp index 2de3a96..90dcadb 100644 --- a/generator/jsonserializationcodegenerator.cpp +++ b/generator/jsonserializationcodegenerator.cpp @@ -45,8 +45,7 @@ string JsonSerializationCodeGenerator::qualifiedNameIfRelevant(clang::CXXRecordD return qualifiedName; case IsRelevant::No: return string(); - default: - ; + default:; } // consider all classes specified via "--additional-classes" argument relevant diff --git a/generator/main.cpp b/generator/main.cpp index 26308ca..656f7aa 100644 --- a/generator/main.cpp +++ b/generator/main.cpp @@ -1,6 +1,6 @@ +#include "./binaryserializationcodegenerator.h" #include "./codefactory.h" #include "./jsonserializationcodegenerator.h" -#include "./binaryserializationcodegenerator.h" #include "resources/config.h" diff --git a/generator/serializationcodegenerator.cpp b/generator/serializationcodegenerator.cpp index 9598cbf..5134f11 100644 --- a/generator/serializationcodegenerator.cpp +++ b/generator/serializationcodegenerator.cpp @@ -64,7 +64,8 @@ void SerializationCodeGenerator::addDeclaration(clang::Decl *decl) } } -SerializationCodeGenerator::IsRelevant SerializationCodeGenerator::isQualifiedNameIfRelevant(clang::CXXRecordDecl *record, const std::string &qualifiedName) const +SerializationCodeGenerator::IsRelevant SerializationCodeGenerator::isQualifiedNameIfRelevant( + clang::CXXRecordDecl *record, const std::string &qualifiedName) const { // consider all classes for which a specialization of the "AdaptedJsonSerializable" struct is available for (const auto &adaptionRecord : m_adaptionRecords) { @@ -102,7 +103,8 @@ std::vector SerializationCodeGenerato return relevantClasses; } -std::vector SerializationCodeGenerator::findRelevantBaseClasses(const SerializationCodeGenerator::RelevantClass &relevantClass, const std::vector &relevantBases) +std::vector SerializationCodeGenerator::findRelevantBaseClasses( + const SerializationCodeGenerator::RelevantClass &relevantClass, const std::vector &relevantBases) { vector relevantBaseClasses; for (const RelevantClass &otherClass : relevantBases) { diff --git a/generator/serializationcodegenerator.h b/generator/serializationcodegenerator.h index 040ad6e..ba171c3 100644 --- a/generator/serializationcodegenerator.h +++ b/generator/serializationcodegenerator.h @@ -27,9 +27,7 @@ public: void addDeclaration(clang::Decl *decl) override; protected: - enum class IsRelevant { - Yes, No, Maybe - }; + enum class IsRelevant { Yes, No, Maybe }; IsRelevant isQualifiedNameIfRelevant(clang::CXXRecordDecl *record, const std::string &qualifiedName) const; virtual std::string qualifiedNameIfRelevant(clang::CXXRecordDecl *record) const = 0; std::vector findRelevantClasses() const; diff --git a/generator/tests/morestructs.h b/generator/tests/morestructs.h index 37a3269..e9cfe78 100644 --- a/generator/tests/morestructs.h +++ b/generator/tests/morestructs.h @@ -1,8 +1,8 @@ #ifndef REFLECTIVE_RAPIDJSON_TESTS_MORE_STRUCTS_H #define REFLECTIVE_RAPIDJSON_TESTS_MORE_STRUCTS_H -#include "../../lib/json/serializable.h" #include "../../lib/binary/serializable.h" +#include "../../lib/json/serializable.h" using namespace std; using namespace ReflectiveRapidJSON; diff --git a/generator/tests/structs.h b/generator/tests/structs.h index 6f6b0c2..eb4cf33 100644 --- a/generator/tests/structs.h +++ b/generator/tests/structs.h @@ -8,10 +8,10 @@ // contained structs as well (to prevent violating the one definition rule) #include "./morestructs.h" -#include "../../lib/json/reflector-chronoutilities.h" -#include "../../lib/json/serializable.h" #include "../../lib/binary/reflector-chronoutilities.h" #include "../../lib/binary/serializable.h" +#include "../../lib/json/reflector-chronoutilities.h" +#include "../../lib/json/serializable.h" #include #include diff --git a/lib/binary/reflector-boosthana.h b/lib/binary/reflector-boosthana.h index b13e43c..fd57de2 100644 --- a/lib/binary/reflector-boosthana.h +++ b/lib/binary/reflector-boosthana.h @@ -24,23 +24,19 @@ namespace ReflectiveRapidJSON { namespace BinaryReflector { -template > *> -void readCustomType(BinaryDeserializer &deserializer, Type &customType) +template > *> void readCustomType(BinaryDeserializer &deserializer, Type &customType) { - boost::hana::for_each(boost::hana::keys(customType), [&deserializer, &customType](auto key) { - deserializer.read(boost::hana::at_key(customType, key)); - }); + boost::hana::for_each( + boost::hana::keys(customType), [&deserializer, &customType](auto key) { deserializer.read(boost::hana::at_key(customType, key)); }); } -template > *> -void writeCustomType(BinarySerializer &serializer, const Type &customType) +template > *> void writeCustomType(BinarySerializer &serializer, const Type &customType) { - boost::hana::for_each(boost::hana::keys(customType), [&serializer, &customType](auto key) { - serializer.write(boost::hana::at_key(customType, key)); - }); + boost::hana::for_each( + boost::hana::keys(customType), [&serializer, &customType](auto key) { serializer.write(boost::hana::at_key(customType, key)); }); } -} // namespace JsonReflector +} // namespace BinaryReflector } // namespace ReflectiveRapidJSON #endif // REFLECTIVE_RAPIDJSON_BINARY_REFLECTOR_BOOST_HANA_H diff --git a/lib/binary/serializable.h b/lib/binary/serializable.h index 0a67d7b..741c3e2 100644 --- a/lib/binary/serializable.h +++ b/lib/binary/serializable.h @@ -35,8 +35,7 @@ template inline void BinarySerializable::restoreFromBinary BinaryReflector::BinaryDeserializer(&inputStream).read(static_cast(*this)); } -template -Type BinarySerializable::fromBinary(std::istream &inputStream) +template Type BinarySerializable::fromBinary(std::istream &inputStream) { Type object; static_cast &>(object).restoreFromBinary(inputStream);