diff --git a/alib2common/src/PrimitiveRegistrator.cpp b/alib2common/src/PrimitiveRegistrator.cpp index 831d9d0df62ebd9d075c6525dbc8b73dd0837117..541ea03c87e9854306073ce7cc1e94475daf5996 100644 --- a/alib2common/src/PrimitiveRegistrator.cpp +++ b/alib2common/src/PrimitiveRegistrator.cpp @@ -6,7 +6,6 @@ */ #include <registry/CastRegistry.hpp> -#include <registry/NormalizeRegistry.hpp> #include <registry/ValuePrinterRegistry.hpp> #include <registry/ImmediateRegistry.hpp> #include <registry/ContainerRegistry.hpp> @@ -40,7 +39,9 @@ public: abstraction::CastRegistry::registerCast < size_t, int > ( ); abstraction::CastRegistry::registerCast < int, size_t > ( ); abstraction::CastRegistry::registerCast < unsigned, int > ( ); - + + abstraction::CastRegistry::registerCast < long, int > ( "long", ext::to_string < int > ( ) ); + abstraction::CastRegistry::registerCast < int, primitive::Integer > ( ); abstraction::CastRegistry::registerCast < primitive::Integer, int > ( ); @@ -59,6 +60,37 @@ public: abstraction::ValuePrinterRegistry::registerValuePrinter < object::Object > ( ); abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < object::Object > > ( ); abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < unsigned > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::vector<object::Object> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::vector<ext::pair<object::Object, + object::Object> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, double> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, int> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, long> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, + object::Object> >, + double> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, + object::Object> >, + int> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, + object::Object> >, + long> >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, + ext::map<object::Object, double> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, + ext::map<object::Object, int> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, + ext::map<object::Object, long> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, + ext::map<ext::pair<object::Object, + object::Object>, + double> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, + ext::map<ext::pair<object::Object, + object::Object>, int> > >(); + abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, + ext::map<ext::pair<object::Object, + object::Object>, long> > >(); abstraction::ContainerRegistry::registerSet < object::Object > ( ); } };