From 8cac13310486c8c3a9f01cf0bedc917cf3d858a2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 10 Jun 2019 22:46:06 +0200 Subject: [PATCH] Adapt to changes in c++utilities --- .../binaryserializationcodegenerator.cpp | 2 +- generator/binaryserializationcodegenerator.h | 8 ++++---- generator/jsonserializationcodegenerator.cpp | 2 +- generator/jsonserializationcodegenerator.h | 8 ++++---- generator/main.cpp | 9 +++------ generator/tests/binarygenerator.cpp | 6 ++---- generator/tests/helper.h | 12 ++++++----- generator/tests/jsongenerator.cpp | 6 ++---- generator/tests/structs.h | 4 ++-- lib/binary/reflector-chronoutilities.h | 8 ++++---- lib/binary/reflector.h | 14 ++++++------- lib/json/reflector-chronoutilities.h | 20 +++++++++---------- lib/tests/binaryreflector-boosthana.cpp | 8 +++----- lib/tests/binaryreflector.cpp | 11 ++++------ lib/tests/jsonreflector-boosthana.cpp | 8 +++----- lib/tests/jsonreflector-chronoutilities.cpp | 4 ++-- lib/tests/jsonreflector.cpp | 8 +++----- lib/traits.h | 2 ++ 18 files changed, 64 insertions(+), 76 deletions(-) diff --git a/generator/binaryserializationcodegenerator.cpp b/generator/binaryserializationcodegenerator.cpp index b5cfeec..8c4d40c 100644 --- a/generator/binaryserializationcodegenerator.cpp +++ b/generator/binaryserializationcodegenerator.cpp @@ -9,7 +9,7 @@ #include using namespace std; -using namespace ApplicationUtilities; +using namespace CppUtilities; namespace ReflectiveRapidJSON { diff --git a/generator/binaryserializationcodegenerator.h b/generator/binaryserializationcodegenerator.h index d5b1156..2563db8 100644 --- a/generator/binaryserializationcodegenerator.h +++ b/generator/binaryserializationcodegenerator.h @@ -16,10 +16,10 @@ public: struct Options { Options(); Options(const Options &other) = delete; - void appendTo(ApplicationUtilities::Argument *arg); + void appendTo(CppUtilities::Argument *arg); - ApplicationUtilities::ConfigValueArgument additionalClassesArg; - ApplicationUtilities::ConfigValueArgument visibilityArg; + CppUtilities::ConfigValueArgument additionalClassesArg; + CppUtilities::ConfigValueArgument visibilityArg; }; BinarySerializationCodeGenerator(CodeFactory &factory, const Options &options); @@ -32,7 +32,7 @@ protected: const Options &m_options; }; -inline void BinarySerializationCodeGenerator::Options::appendTo(ApplicationUtilities::Argument *arg) +inline void BinarySerializationCodeGenerator::Options::appendTo(CppUtilities::Argument *arg) { arg->addSubArgument(&additionalClassesArg); arg->addSubArgument(&visibilityArg); diff --git a/generator/jsonserializationcodegenerator.cpp b/generator/jsonserializationcodegenerator.cpp index 90dcadb..268c002 100644 --- a/generator/jsonserializationcodegenerator.cpp +++ b/generator/jsonserializationcodegenerator.cpp @@ -9,7 +9,7 @@ #include using namespace std; -using namespace ApplicationUtilities; +using namespace CppUtilities; namespace ReflectiveRapidJSON { diff --git a/generator/jsonserializationcodegenerator.h b/generator/jsonserializationcodegenerator.h index 18d9aa9..67e8a19 100644 --- a/generator/jsonserializationcodegenerator.h +++ b/generator/jsonserializationcodegenerator.h @@ -16,10 +16,10 @@ public: struct Options { Options(); Options(const Options &other) = delete; - void appendTo(ApplicationUtilities::Argument *arg); + void appendTo(CppUtilities::Argument *arg); - ApplicationUtilities::ConfigValueArgument additionalClassesArg; - ApplicationUtilities::ConfigValueArgument visibilityArg; + CppUtilities::ConfigValueArgument additionalClassesArg; + CppUtilities::ConfigValueArgument visibilityArg; }; JsonSerializationCodeGenerator(CodeFactory &factory, const Options &options); @@ -32,7 +32,7 @@ protected: const Options &m_options; }; -inline void JsonSerializationCodeGenerator::Options::appendTo(ApplicationUtilities::Argument *arg) +inline void JsonSerializationCodeGenerator::Options::appendTo(CppUtilities::Argument *arg) { arg->addSubArgument(&additionalClassesArg); arg->addSubArgument(&visibilityArg); diff --git a/generator/main.cpp b/generator/main.cpp index ebe01de..8ca0f1d 100644 --- a/generator/main.cpp +++ b/generator/main.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -17,10 +16,8 @@ #include using namespace std; -using namespace ApplicationUtilities; -using namespace ConversionUtilities; -using namespace EscapeCodes; -using namespace IoUtilities; +using namespace CppUtilities; +using namespace CppUtilities::EscapeCodes; using namespace ReflectiveRapidJSON; int main(int argc, char *argv[]) @@ -53,7 +50,7 @@ int main(int argc, char *argv[]) parser.setMainArguments({ &generateArg, &noColorArg, &helpArg }); // parse arguments - parser.parseArgsOrExit(argc, argv); + parser.parseArgs(argc, argv, ParseArgumentBehavior::CheckConstraints | ParseArgumentBehavior::InvokeCallbacks); if (helpArg.isPresent() || !generateArg.isPresent()) { return 0; } diff --git a/generator/tests/binarygenerator.cpp b/generator/tests/binarygenerator.cpp index 49fefa7..fa8f8c1 100644 --- a/generator/tests/binarygenerator.cpp +++ b/generator/tests/binarygenerator.cpp @@ -19,10 +19,8 @@ #include using namespace CPPUNIT_NS; -using namespace IoUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; -using namespace ConversionUtilities; +using namespace CppUtilities; +using namespace CppUtilities::Literals; /*! * \brief The BinaryGeneratorTests class tests the binary generator. diff --git a/generator/tests/helper.h b/generator/tests/helper.h index 6c01db9..5b30714 100644 --- a/generator/tests/helper.h +++ b/generator/tests/helper.h @@ -6,10 +6,12 @@ #include // ensure "operator<<" from TestUtilities is visible prior to the call site -using TestUtilities::operator<<; +using CppUtilities::operator<<; #include +namespace Traits = CppUtilities::Traits; + /*! * \brief Asserts equality of two iteratables printing the differing indices. */ @@ -22,20 +24,20 @@ inline void assertEqualityLinewise(const Iteratable &iteratable1, const Iteratab for (auto i1 = iteratable1.cbegin(), i2 = iteratable2.cbegin(); i1 != iteratable1.cend() || i2 != iteratable2.cend(); ++currentLine) { if (i1 != iteratable1.cend() && i2 != iteratable2.cend()) { if (*i1 != *i2) { - differentLines.push_back(ConversionUtilities::numberToString(currentLine)); + differentLines.push_back(CppUtilities::numberToString(currentLine)); } ++i1, ++i2; } else if (i1 != iteratable1.cend()) { - differentLines.push_back(ConversionUtilities::numberToString(currentLine)); + differentLines.push_back(CppUtilities::numberToString(currentLine)); ++i1; } else if (i2 != iteratable1.cend()) { - differentLines.push_back(ConversionUtilities::numberToString(currentLine)); + differentLines.push_back(CppUtilities::numberToString(currentLine)); ++i2; } } if (!differentLines.empty()) { CPPUNIT_ASSERT_EQUAL_MESSAGE( - "the following lines differ: " + ConversionUtilities::joinStrings(differentLines, ", "), iteratable1, iteratable2); + "the following lines differ: " + CppUtilities::joinStrings(differentLines, ", "), iteratable1, iteratable2); } } diff --git a/generator/tests/jsongenerator.cpp b/generator/tests/jsongenerator.cpp index 9a8c088..a36e582 100644 --- a/generator/tests/jsongenerator.cpp +++ b/generator/tests/jsongenerator.cpp @@ -17,10 +17,8 @@ #include using namespace CPPUNIT_NS; -using namespace IoUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; -using namespace ConversionUtilities; +using namespace CppUtilities; +using namespace CppUtilities::Literals; /*! * \brief The JsonGeneratorTests class tests the overall functionality of the code generator (CLI and generator itself) and JSON specific parts. diff --git a/generator/tests/structs.h b/generator/tests/structs.h index d16d16a..a18aa3d 100644 --- a/generator/tests/structs.h +++ b/generator/tests/structs.h @@ -99,8 +99,8 @@ struct MultipleDerivedTestStruct : public TestStruct, * and toJson() methods. This is asserted in JsonGeneratorTests::testCustomSerialization(); */ struct StructWithCustomTypes : public JsonSerializable { - ChronoUtilities::DateTime dt = ChronoUtilities::DateTime::fromDateAndTime(2017, 4, 2, 15, 31, 21, 165.125); - ChronoUtilities::TimeSpan ts = ChronoUtilities::TimeSpan::fromHours(3.25) + ChronoUtilities::TimeSpan::fromSeconds(19.125); + CppUtilities::DateTime dt = CppUtilities::DateTime::fromDateAndTime(2017, 4, 2, 15, 31, 21, 165.125); + CppUtilities::TimeSpan ts = CppUtilities::TimeSpan::fromHours(3.25) + CppUtilities::TimeSpan::fromSeconds(19.125); }; /*! diff --git a/lib/binary/reflector-chronoutilities.h b/lib/binary/reflector-chronoutilities.h index fd7168e..79c911e 100644 --- a/lib/binary/reflector-chronoutilities.h +++ b/lib/binary/reflector-chronoutilities.h @@ -16,22 +16,22 @@ namespace ReflectiveRapidJSON { namespace BinaryReflector { -template <> inline void readCustomType(BinaryDeserializer &deserializer, ChronoUtilities::DateTime &dateTime) +template <> inline void readCustomType(BinaryDeserializer &deserializer, CppUtilities::DateTime &dateTime) { deserializer.read(dateTime.ticks()); } -template <> inline void writeCustomType(BinarySerializer &serializer, const ChronoUtilities::DateTime &dateTime) +template <> inline void writeCustomType(BinarySerializer &serializer, const CppUtilities::DateTime &dateTime) { serializer.write(dateTime.totalTicks()); } -template <> inline void readCustomType(BinaryDeserializer &deserializer, ChronoUtilities::TimeSpan &timeSpan) +template <> inline void readCustomType(BinaryDeserializer &deserializer, CppUtilities::TimeSpan &timeSpan) { deserializer.read(timeSpan.ticks()); } -template <> inline void writeCustomType(BinarySerializer &serializer, const ChronoUtilities::TimeSpan &timeSpan) +template <> inline void writeCustomType(BinarySerializer &serializer, const CppUtilities::TimeSpan &timeSpan) { serializer.write(timeSpan.totalTicks()); } diff --git a/lib/binary/reflector.h b/lib/binary/reflector.h index a09e8a9..6b617be 100644 --- a/lib/binary/reflector.h +++ b/lib/binary/reflector.h @@ -49,11 +49,11 @@ class BinarySerializer; template > * = nullptr> void readCustomType(BinaryDeserializer &deserializer, Type &customType); template > * = nullptr> void writeCustomType(BinarySerializer &serializer, const Type &customType); -class BinaryDeserializer : public IoUtilities::BinaryReader { +class BinaryDeserializer : public CppUtilities::BinaryReader { public: BinaryDeserializer(std::istream *stream); - using IoUtilities::BinaryReader::read; + using CppUtilities::BinaryReader::read; template > * = nullptr> void read(Type &pair); template > * = nullptr> void read(Type &pair); template > * = nullptr> void read(Type &pair); @@ -69,11 +69,11 @@ public: std::unordered_map m_pointer; }; -class BinarySerializer : public IoUtilities::BinaryWriter { +class BinarySerializer : public CppUtilities::BinaryWriter { public: BinarySerializer(std::ostream *stream); - using IoUtilities::BinaryWriter::write; + using CppUtilities::BinaryWriter::write; template > * = nullptr> void write(const Type &pair); template > * = nullptr> void write(const Type &pointer); template > * = nullptr> void write(const Type &pointer); @@ -85,7 +85,7 @@ public: }; inline BinaryDeserializer::BinaryDeserializer(std::istream *stream) - : IoUtilities::BinaryReader(stream) + : CppUtilities::BinaryReader(stream) { } @@ -125,7 +125,7 @@ template (m_pointer[id]); } catch (const std::bad_any_cast &) { - throw ConversionUtilities::ConversionException("Referenced pointer type does not match"); + throw CppUtilities::ConversionException("Referenced pointer type does not match"); } } @@ -174,7 +174,7 @@ template > *> void BinaryDese } inline BinarySerializer::BinarySerializer(std::ostream *stream) - : IoUtilities::BinaryWriter(stream) + : CppUtilities::BinaryWriter(stream) { } diff --git a/lib/json/reflector-chronoutilities.h b/lib/json/reflector-chronoutilities.h index ee24ace..7acccaf 100644 --- a/lib/json/reflector-chronoutilities.h +++ b/lib/json/reflector-chronoutilities.h @@ -20,16 +20,16 @@ namespace JsonReflector { // define functions to "push" values to a RapidJSON array or object template <> -inline void push( - const ChronoUtilities::DateTime &reflectable, RAPIDJSON_NAMESPACE::Value &value, RAPIDJSON_NAMESPACE::Document::AllocatorType &allocator) +inline void push( + const CppUtilities::DateTime &reflectable, RAPIDJSON_NAMESPACE::Value &value, RAPIDJSON_NAMESPACE::Document::AllocatorType &allocator) { const std::string str(reflectable.toIsoString()); value.SetString(str.data(), rapidJsonSize(str.size()), allocator); } template <> -inline void push( - const ChronoUtilities::TimeSpan &reflectable, RAPIDJSON_NAMESPACE::Value &value, RAPIDJSON_NAMESPACE::Document::AllocatorType &allocator) +inline void push( + const CppUtilities::TimeSpan &reflectable, RAPIDJSON_NAMESPACE::Value &value, RAPIDJSON_NAMESPACE::Document::AllocatorType &allocator) { const std::string str(reflectable.toString()); value.SetString(str.data(), rapidJsonSize(str.size()), allocator); @@ -38,14 +38,14 @@ inline void push( // define functions to "pull" values from a RapidJSON array or object template <> -inline void pull(ChronoUtilities::DateTime &reflectable, +inline void pull(CppUtilities::DateTime &reflectable, const RAPIDJSON_NAMESPACE::GenericValue> &value, JsonDeserializationErrors *errors) { std::string str; pull(str, value, errors); try { - reflectable = ChronoUtilities::DateTime::fromIsoStringGmt(str.data()); - } catch (const ConversionUtilities::ConversionException &) { + reflectable = CppUtilities::DateTime::fromIsoStringGmt(str.data()); + } catch (const CppUtilities::ConversionException &) { if (errors) { errors->reportConversionError(JsonType::String); } @@ -53,14 +53,14 @@ inline void pull(ChronoUtilities::DateTime &reflectab } template <> -inline void pull(ChronoUtilities::TimeSpan &reflectable, +inline void pull(CppUtilities::TimeSpan &reflectable, const RAPIDJSON_NAMESPACE::GenericValue> &value, JsonDeserializationErrors *errors) { std::string str; pull(str, value, errors); try { - reflectable = ChronoUtilities::TimeSpan::fromString(str.data()); - } catch (const ConversionUtilities::ConversionException &) { + reflectable = CppUtilities::TimeSpan::fromString(str.data()); + } catch (const CppUtilities::ConversionException &) { if (errors) { errors->reportConversionError(JsonType::String); } diff --git a/lib/tests/binaryreflector-boosthana.cpp b/lib/tests/binaryreflector-boosthana.cpp index 5328cf1..6204471 100644 --- a/lib/tests/binaryreflector-boosthana.cpp +++ b/lib/tests/binaryreflector-boosthana.cpp @@ -6,7 +6,7 @@ #include #include -using TestUtilities::operator<<; // must be visible prior to the call site +using CppUtilities::operator<<; // must be visible prior to the call site #include #include @@ -21,10 +21,8 @@ using TestUtilities::operator<<; // must be visible prior to the call site using namespace std; using namespace CPPUNIT_NS; using namespace RAPIDJSON_NAMESPACE; -using namespace IoUtilities; -using namespace ConversionUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace ReflectiveRapidJSON; /// \cond diff --git a/lib/tests/binaryreflector.cpp b/lib/tests/binaryreflector.cpp index 31a38fe..1af7a82 100644 --- a/lib/tests/binaryreflector.cpp +++ b/lib/tests/binaryreflector.cpp @@ -7,7 +7,7 @@ #include #include -using TestUtilities::operator<<; // must be visible prior to the call site +using CppUtilities::operator<<; // must be visible prior to the call site #include #include @@ -23,11 +23,8 @@ using TestUtilities::operator<<; // must be visible prior to the call site using namespace std; using namespace CPPUNIT_NS; -using namespace IoUtilities; -using namespace ChronoUtilities; -using namespace ConversionUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace ReflectiveRapidJSON; /// \cond @@ -318,7 +315,7 @@ void BinaryReflectorTests::testSharedPointer(uintptr_t fakePointer) BinaryReflector::BinaryDeserializer deserializer(&stream); shared_ptr readPtr; deserializer.m_pointer[fakePointer] = "foo"; - CPPUNIT_ASSERT_THROW(deserializer.read(readPtr), ConversionUtilities::ConversionException); + CPPUNIT_ASSERT_THROW(deserializer.read(readPtr), CppUtilities::ConversionException); CPPUNIT_ASSERT(readPtr == nullptr); // deserialize the shared pointer assuming it has already been read and the type matches diff --git a/lib/tests/jsonreflector-boosthana.cpp b/lib/tests/jsonreflector-boosthana.cpp index fe8d994..c70eac8 100644 --- a/lib/tests/jsonreflector-boosthana.cpp +++ b/lib/tests/jsonreflector-boosthana.cpp @@ -6,7 +6,7 @@ #include #include -using TestUtilities::operator<<; // must be visible prior to the call site +using CppUtilities::operator<<; // must be visible prior to the call site #include #include @@ -21,10 +21,8 @@ using TestUtilities::operator<<; // must be visible prior to the call site using namespace std; using namespace CPPUNIT_NS; using namespace RAPIDJSON_NAMESPACE; -using namespace IoUtilities; -using namespace ConversionUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace ReflectiveRapidJSON; /// \cond diff --git a/lib/tests/jsonreflector-chronoutilities.cpp b/lib/tests/jsonreflector-chronoutilities.cpp index 4d07ef0..b61239e 100644 --- a/lib/tests/jsonreflector-chronoutilities.cpp +++ b/lib/tests/jsonreflector-chronoutilities.cpp @@ -17,8 +17,8 @@ using namespace std; using namespace CPPUNIT_NS; using namespace RAPIDJSON_NAMESPACE; -using namespace ChronoUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace ReflectiveRapidJSON; /*! diff --git a/lib/tests/jsonreflector.cpp b/lib/tests/jsonreflector.cpp index 4020efa..55f39d9 100644 --- a/lib/tests/jsonreflector.cpp +++ b/lib/tests/jsonreflector.cpp @@ -6,7 +6,7 @@ #include #include -using TestUtilities::operator<<; // must be visible prior to the call site +using CppUtilities::operator<<; // must be visible prior to the call site #include #include @@ -24,10 +24,8 @@ using TestUtilities::operator<<; // must be visible prior to the call site using namespace std; using namespace CPPUNIT_NS; using namespace RAPIDJSON_NAMESPACE; -using namespace IoUtilities; -using namespace ConversionUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace ReflectiveRapidJSON; /// \cond diff --git a/lib/traits.h b/lib/traits.h index 681e37a..81ae6fa 100644 --- a/lib/traits.h +++ b/lib/traits.h @@ -11,6 +11,8 @@ namespace ReflectiveRapidJSON { +namespace Traits = ::CppUtilities::Traits; + // define structs and macros to allow treating custom data types as std::map, std::set, ... /// \brief \brief The TreatAsMapOrHash class allows treating custom classes as std::map or std::unordered_map. template struct TreatAsMapOrHash : public Traits::Bool {