From 9050fd1ee5a46d136c2858a3089e51154b720103 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Thu, 20 Feb 2020 08:47:32 +0100 Subject: [PATCH] unit build string primitive --- alib2str/src/primitive/string/{Bool.cpp => Bool.cxx} | 4 ++-- .../src/primitive/string/{Character.cpp => Character.cxx} | 4 ++-- .../src/primitive/string/{Integer.cpp => Integer.cxx} | 8 ++++---- alib2str/src/primitive/string/Primitive.cpp | 6 ++++++ alib2str/src/primitive/string/{String.cpp => String.cxx} | 8 ++++---- .../src/primitive/string/{Unsigned.cpp => Unsigned.cxx} | 4 ++-- .../string/{UnsignedLong.cpp => UnsignedLong.cxx} | 4 ++-- 7 files changed, 22 insertions(+), 16 deletions(-) rename alib2str/src/primitive/string/{Bool.cpp => Bool.cxx} (76%) rename alib2str/src/primitive/string/{Character.cpp => Character.cxx} (75%) rename alib2str/src/primitive/string/{Integer.cpp => Integer.cxx} (73%) create mode 100644 alib2str/src/primitive/string/Primitive.cpp rename alib2str/src/primitive/string/{String.cpp => String.cxx} (72%) rename alib2str/src/primitive/string/{Unsigned.cpp => Unsigned.cxx} (75%) rename alib2str/src/primitive/string/{UnsignedLong.cpp => UnsignedLong.cxx} (74%) diff --git a/alib2str/src/primitive/string/Bool.cpp b/alib2str/src/primitive/string/Bool.cxx similarity index 76% rename from alib2str/src/primitive/string/Bool.cpp rename to alib2str/src/primitive/string/Bool.cxx index cf1aa2e258..d692e75035 100644 --- a/alib2str/src/primitive/string/Bool.cpp +++ b/alib2str/src/primitive/string/Bool.cxx @@ -28,8 +28,8 @@ void stringApi < bool >::compose ( std::ostream & output, bool primitive ) { namespace { -auto stringWrite = registration::StringWriterRegister < bool > ( ); +auto stringWriteBool = registration::StringWriterRegister < bool > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, bool > ( ); +auto stringWriteGroupBool = registration::StringWriterRegisterTypeInGroup < object::Object, bool > ( ); } /* namespace */ diff --git a/alib2str/src/primitive/string/Character.cpp b/alib2str/src/primitive/string/Character.cxx similarity index 75% rename from alib2str/src/primitive/string/Character.cpp rename to alib2str/src/primitive/string/Character.cxx index c116224a65..7a7936c81e 100644 --- a/alib2str/src/primitive/string/Character.cpp +++ b/alib2str/src/primitive/string/Character.cxx @@ -28,8 +28,8 @@ void stringApi < char >::compose ( std::ostream & output, char primitive ) { namespace { -auto stringWrite = registration::StringWriterRegister < char > ( ); +auto stringWriteCharacter = registration::StringWriterRegister < char > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, char > ( ); +auto stringWriteGroupCharacter = registration::StringWriterRegisterTypeInGroup < object::Object, char > ( ); } /* namespace */ diff --git a/alib2str/src/primitive/string/Integer.cpp b/alib2str/src/primitive/string/Integer.cxx similarity index 73% rename from alib2str/src/primitive/string/Integer.cpp rename to alib2str/src/primitive/string/Integer.cxx index 852f30a49f..1d169bb1ed 100644 --- a/alib2str/src/primitive/string/Integer.cpp +++ b/alib2str/src/primitive/string/Integer.cxx @@ -35,10 +35,10 @@ void stringApi < int >::compose ( std::ostream & output, int primitive ) { namespace { -auto stringWrite = registration::StringWriterRegister < int > ( ); -auto stringReader = registration::StringReaderRegister < object::Object, int > ( ); +auto stringWriteInteger = registration::StringWriterRegister < int > ( ); +auto stringReaderInteger = registration::StringReaderRegister < object::Object, int > ( ); -auto stringReaderGroup = registration::StringReaderRegisterTypeInGroup < object::Object, int > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, int > ( ); +auto stringReaderGroupInteger = registration::StringReaderRegisterTypeInGroup < object::Object, int > ( ); +auto stringWriteGroupInteger = registration::StringWriterRegisterTypeInGroup < object::Object, int > ( ); } /* namespace */ diff --git a/alib2str/src/primitive/string/Primitive.cpp b/alib2str/src/primitive/string/Primitive.cpp new file mode 100644 index 0000000000..cfdb9d0a1e --- /dev/null +++ b/alib2str/src/primitive/string/Primitive.cpp @@ -0,0 +1,6 @@ +#include "Bool.cxx" +#include "Character.cxx" +#include "Integer.cxx" +#include "String.cxx" +#include "Unsigned.cxx" +#include "UnsignedLong.cxx" diff --git a/alib2str/src/primitive/string/String.cpp b/alib2str/src/primitive/string/String.cxx similarity index 72% rename from alib2str/src/primitive/string/String.cpp rename to alib2str/src/primitive/string/String.cxx index acfc705e43..c4b4af67a9 100644 --- a/alib2str/src/primitive/string/String.cpp +++ b/alib2str/src/primitive/string/String.cxx @@ -35,10 +35,10 @@ void stringApi < std::string >::compose ( std::ostream & output, const std::stri namespace { -auto stringWrite = registration::StringWriterRegister < std::string > ( ); -auto stringReader = registration::StringReaderRegister < object::Object, std::string > ( ); +auto stringWriteString = registration::StringWriterRegister < std::string > ( ); +auto stringReaderString = registration::StringReaderRegister < object::Object, std::string > ( ); -auto stringReaderGroup = registration::StringReaderRegisterTypeInGroup < object::Object, std::string > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, std::string > ( ); +auto stringReaderGroupString = registration::StringReaderRegisterTypeInGroup < object::Object, std::string > ( ); +auto stringWriteGroupString = registration::StringWriterRegisterTypeInGroup < object::Object, std::string > ( ); } /* namespace */ diff --git a/alib2str/src/primitive/string/Unsigned.cpp b/alib2str/src/primitive/string/Unsigned.cxx similarity index 75% rename from alib2str/src/primitive/string/Unsigned.cpp rename to alib2str/src/primitive/string/Unsigned.cxx index d2ccffdf47..c32eaa3efa 100644 --- a/alib2str/src/primitive/string/Unsigned.cpp +++ b/alib2str/src/primitive/string/Unsigned.cxx @@ -28,8 +28,8 @@ void stringApi < unsigned >::compose ( std::ostream & output, unsigned primitive namespace { -auto stringWrite = registration::StringWriterRegister < unsigned > ( ); +auto stringWriteUnsigned = registration::StringWriterRegister < unsigned > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, unsigned > ( ); +auto stringWriteGroupUnsigned = registration::StringWriterRegisterTypeInGroup < object::Object, unsigned > ( ); } /* namespace */ diff --git a/alib2str/src/primitive/string/UnsignedLong.cpp b/alib2str/src/primitive/string/UnsignedLong.cxx similarity index 74% rename from alib2str/src/primitive/string/UnsignedLong.cpp rename to alib2str/src/primitive/string/UnsignedLong.cxx index 927609e572..8ed428d4c9 100644 --- a/alib2str/src/primitive/string/UnsignedLong.cpp +++ b/alib2str/src/primitive/string/UnsignedLong.cxx @@ -28,8 +28,8 @@ void stringApi < unsigned long >::compose ( std::ostream & output, unsigned long namespace { -auto stringWrite = registration::StringWriterRegister < unsigned long > ( ); +auto stringWriteUnsignedLong = registration::StringWriterRegister < unsigned long > ( ); -auto stringWriteGroup = registration::StringWriterRegisterTypeInGroup < object::Object, unsigned long > ( ); +auto stringWriteGroupUnsignedLong = registration::StringWriterRegisterTypeInGroup < object::Object, unsigned long > ( ); } /* namespace */ -- GitLab