From 45bd27ff2abbb76a27904ce9a33bee24c67c7bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz>
Date: Mon, 13 Dec 2021 23:39:39 +0100
Subject: [PATCH] registration: consolidate the registration code a bit
---
alib2data/src/PrimitiveRegistrator.cpp | 13 +++++--------
alib2xml/src/PrimitiveRegistrator.cpp | 1 +
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/alib2data/src/PrimitiveRegistrator.cpp b/alib2data/src/PrimitiveRegistrator.cpp
index 170f3c5102..3c6f3ab81c 100644
--- a/alib2data/src/PrimitiveRegistrator.cpp
+++ b/alib2data/src/PrimitiveRegistrator.cpp
@@ -2,7 +2,7 @@
#include <registration/XmlRegistration.hpp>
#include <registry/XmlContainerParserRegistry.hpp>
-#include <registry/ValuePrinterRegistry.hpp>
+#include <registration/ValuePrinterRegistration.hpp>
#include <primitive/xml/UnsignedLong.h>
#include <primitive/xml/Unsigned.h>
@@ -30,19 +30,16 @@ class PrimitiveRegistrator {
registration::XmlWriterRegister < ext::map < common::ranked_symbol < object::Object >, size_t > > member4;
registration::XmlWriterRegister < ext::set < string::LinearString < > > > member5;
registration::XmlWriterRegister < ext::trie < DefaultSymbolType, bool > > member6;
+ registration::XmlWriterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > member7;
+
+ registration::ValuePrinterRegister < ext::set < string::LinearString < > > > member8;
+ registration::ValuePrinterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > member9;
public:
PrimitiveRegistrator ( ) {
abstraction::ContainerRegistry::registerSet < common::ranked_symbol < object::Object > > ( "RankedSymbol" );
abstraction::XmlContainerParserRegistry::registerSet < common::ranked_symbol < object::Object > > ( "RankedSymbol" );
- registration::XmlWriterRegister < common::ranked_symbol < object::Object > > ( );
- registration::XmlWriterRegister < ext::set < ext::pair < unsigned, unsigned > > > ( );
- registration::XmlWriterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > ( );
-
- abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < string::LinearString < > > > ( );
- abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < ext::pair < string::LinearString < >, unsigned int > > > ( );
-
abstraction::XmlParserRegistry::registerXmlParser < object::Object > ( "DefaultStateType" );
core::xmlApi < object::Object >::template registerXmlWriter < ext::set < common::ranked_symbol < object::Object > > > ( );
diff --git a/alib2xml/src/PrimitiveRegistrator.cpp b/alib2xml/src/PrimitiveRegistrator.cpp
index ebb346dbd8..cbef23bbe2 100644
--- a/alib2xml/src/PrimitiveRegistrator.cpp
+++ b/alib2xml/src/PrimitiveRegistrator.cpp
@@ -27,6 +27,7 @@ class PrimitiveRegistrator {
registration::XmlWriterRegister < ext::set < int > > member6;
registration::XmlWriterRegister < ext::map < object::Object, size_t > > member7;
registration::XmlWriterRegister < object::Object > member8;
+ registration::XmlWriterRegister < ext::set < ext::pair < unsigned, unsigned > > > member9;
public:
PrimitiveRegistrator ( ) {
--
GitLab