From f53c47842b6e8075927117597f89faa1a892f31d Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 30 Mar 2017 12:05:46 +0200
Subject: [PATCH] normalization of common types
---
alib2common/src/container/ObjectsDeque.h | 13 +++++++++++++
alib2common/src/container/ObjectsList.h | 13 +++++++++++++
alib2common/src/container/ObjectsMap.h | 13 +++++++++++++
alib2common/src/container/ObjectsPair.h | 9 +++++++++
alib2common/src/container/ObjectsSet.h | 13 +++++++++++++
alib2common/src/container/ObjectsTree.h | 15 +++++++++++++++
alib2common/src/container/ObjectsTrie.h | 15 +++++++++++++++
alib2common/src/container/ObjectsVector.h | 13 +++++++++++++
alib2common/src/exception/CommonException.h | 4 ++++
alib2common/src/object/AnyObject.h | 4 ++++
alib2common/src/object/UniqueObject.h | 4 ++++
alib2common/src/object/Void.h | 4 ++++
alib2common/src/primitive/Bool.h | 4 ++++
alib2common/src/primitive/Character.h | 4 ++++
alib2common/src/primitive/Integer.h | 4 ++++
alib2common/src/primitive/String.h | 4 ++++
alib2common/src/primitive/Unsigned.h | 4 ++++
alib2common/src/primitive/UnsignedLong.h | 4 ++++
alib2common/test-src/core/DispatchTest.cpp | 12 ++++++++++++
19 files changed, 156 insertions(+)
diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h
index 0433b462c4..5ae4b7d699 100644
--- a/alib2common/src/container/ObjectsDeque.h
+++ b/alib2common/src/container/ObjectsDeque.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -59,6 +60,18 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::deque < ElementType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::deque < alib::Object > normalizeRaw ( std::deque < ElementType > && source ) {
+ std::deque < alib::Object > res;
+ for ( ElementType & element : source ) {
+ res.push_back ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( element ) ) ) );
+ }
+ return res;
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsDeque < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h
index e886a2d510..ca09218046 100644
--- a/alib2common/src/container/ObjectsList.h
+++ b/alib2common/src/container/ObjectsList.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -59,6 +60,18 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::list < ElementType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::list < alib::Object > normalizeRaw ( std::list < ElementType > && source ) {
+ std::list < alib::Object > res;
+ for ( ElementType & element : source ) {
+ res.push_back ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( element ) ) ) );
+ }
+ return res;
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsList < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h
index 20770ec39f..44735e5b53 100644
--- a/alib2common/src/container/ObjectsMap.h
+++ b/alib2common/src/container/ObjectsMap.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
#include "ObjectsPair.h"
@@ -61,6 +62,18 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::map < KeyType, ValueType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::map < alib::Object, alib::Object > normalizeRaw ( std::map < KeyType, ValueType > && source ) {
+ std::map < alib::Object, alib::Object > res;
+ for ( std::pair < KeyType, ValueType > && element : std::make_moveable_map ( source ) ) {
+ res.insert ( ObjectsPair < KeyType, ValueType >::normalizeRaw ( std::move ( element ) ) );
+ }
+ return res;
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsMap < alib::Object, alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class KeyType, class ValueType >
diff --git a/alib2common/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h
index 8f699e736d..c2cbcc2f32 100644
--- a/alib2common/src/container/ObjectsPair.h
+++ b/alib2common/src/container/ObjectsPair.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -59,6 +60,14 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::pair < FirstType, SecondType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::pair < alib::Object, alib::Object > normalizeRaw ( std::pair < FirstType, SecondType > && source ) {
+ return std::make_pair ( alib::Object ( alib::AnyObject < FirstType > ( std::move ( source.first ) ) ), alib::Object ( alib::AnyObject < SecondType > ( std::move ( source.second ) ) ) );
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsPair < alib::Object, alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class FirstType, class SecondType >
diff --git a/alib2common/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h
index 953e9bb128..acf734f329 100644
--- a/alib2common/src/container/ObjectsSet.h
+++ b/alib2common/src/container/ObjectsSet.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -59,6 +60,18 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::set < ElementType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::set < alib::Object > normalizeRaw ( std::set < ElementType > && source ) {
+ std::set < alib::Object > res;
+ for ( ElementType && element : std::make_moveable_set ( source ) ) {
+ res.insert ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( element ) ) ) );
+ }
+ return res;
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsSet < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h
index edde9ad250..3b13bce372 100644
--- a/alib2common/src/container/ObjectsTree.h
+++ b/alib2common/src/container/ObjectsTree.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -58,6 +59,20 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::tree < ElementType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ std::tree < alib::Object > normalizeRaw ( std::tree < ElementType > && node ) {
+ std::vector < std::tree < alib::Object > > children;
+
+ for ( std::tree < ElementType > & child : node.getChildren ( ) ) {
+ children.push_back ( normalizeRaw ( std::move ( child ) ) );
+ }
+
+ return std::tree < alib::Object > ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( node.getData ( ) ) ) ), std::move ( children ) );
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsTree < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class ElementType >
diff --git a/alib2common/src/container/ObjectsTrie.h b/alib2common/src/container/ObjectsTrie.h
index 058676c5a5..0ce858dc02 100644
--- a/alib2common/src/container/ObjectsTrie.h
+++ b/alib2common/src/container/ObjectsTrie.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -60,6 +61,20 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::trie < KeyType, ValueType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ std::trie < alib::Object, alib::Object > normalizeRaw ( std::trie < KeyType, ValueType > && node ) {
+ std::map < alib::Object, std::trie < alib::Object, alib::Object > > children;
+
+ for ( std::pair < KeyType, std::trie < KeyType, ValueType > > && child : std::make_moveable_map ( node.getChildren ( ) ) ) {
+ children.insert ( std::make_pair ( alib::Object ( alib::AnyObject < KeyType > ( std::move ( child.first ) ) ), normalizeRaw ( std::move ( child.second ) ) ) );
+ }
+
+ return std::trie < alib::Object, alib::Object > ( alib::Object ( alib::AnyObject < ValueType > ( std::move ( node.getData ( ) ) ) ), std::move ( children ) );
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsTrie < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class KeyType, class ValueType >
diff --git a/alib2common/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h
index c183823bb6..1a7dd5de68 100644
--- a/alib2common/src/container/ObjectsVector.h
+++ b/alib2common/src/container/ObjectsVector.h
@@ -17,6 +17,7 @@
#include <core/xmlApi.hpp>
#include "../object/UniqueObject.h"
+#include <object/AnyObject.h>
namespace container {
@@ -59,6 +60,18 @@ public:
static void compose ( std::deque < sax::Token > & out, const std::vector < ElementType > & input );
virtual alib::ObjectBase * inc ( ) &&;
+
+ static std::vector < alib::Object > normalizeRaw ( std::vector < ElementType > && source ) {
+ std::vector < alib::Object > res;
+ for ( ElementType & element : source ) {
+ res.push_back ( alib::Object ( alib::AnyObject < ElementType > ( std::move ( element ) ) ) );
+ }
+ return res;
+ }
+
+ virtual ObjectBase * normalize ( ) && {
+ return new ObjectsVector < alib::Object > ( normalizeRaw ( std::move ( * this ) ) );
+ }
};
template < class ElementType >
diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h
index 5205c4fcc4..9fac25144f 100644
--- a/alib2common/src/exception/CommonException.h
+++ b/alib2common/src/exception/CommonException.h
@@ -81,6 +81,10 @@ public:
void compose ( std::deque < sax::Token > & out ) const;
virtual alib::ObjectBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace exception */
diff --git a/alib2common/src/object/AnyObject.h b/alib2common/src/object/AnyObject.h
index c44761d97c..534b87f51b 100644
--- a/alib2common/src/object/AnyObject.h
+++ b/alib2common/src/object/AnyObject.h
@@ -53,6 +53,10 @@ public:
void compose ( std::deque < sax::Token > & out ) const;
virtual ObjectBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
template < class T >
diff --git a/alib2common/src/object/UniqueObject.h b/alib2common/src/object/UniqueObject.h
index 9b0c5c8271..ecca743262 100644
--- a/alib2common/src/object/UniqueObject.h
+++ b/alib2common/src/object/UniqueObject.h
@@ -64,6 +64,10 @@ public:
void compose ( std::deque < sax::Token > & out ) const;
virtual ObjectBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace alib */
diff --git a/alib2common/src/object/Void.h b/alib2common/src/object/Void.h
index d4dd7c90b2..5a1fd71242 100644
--- a/alib2common/src/object/Void.h
+++ b/alib2common/src/object/Void.h
@@ -54,6 +54,10 @@ public:
void compose ( std::deque < sax::Token > & out ) const;
virtual ObjectBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace alib */
diff --git a/alib2common/src/primitive/Bool.h b/alib2common/src/primitive/Bool.h
index 6cc393e0b7..70f29fe605 100644
--- a/alib2common/src/primitive/Bool.h
+++ b/alib2common/src/primitive/Bool.h
@@ -68,6 +68,10 @@ public:
static void compose ( std::deque < sax::Token > & out, bool primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/src/primitive/Character.h b/alib2common/src/primitive/Character.h
index 7d46b79c72..8ed29bec4c 100644
--- a/alib2common/src/primitive/Character.h
+++ b/alib2common/src/primitive/Character.h
@@ -68,6 +68,10 @@ public:
static void compose ( std::deque < sax::Token > & out, char primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/src/primitive/Integer.h b/alib2common/src/primitive/Integer.h
index 08621cc983..1e1aaf0e9f 100644
--- a/alib2common/src/primitive/Integer.h
+++ b/alib2common/src/primitive/Integer.h
@@ -68,6 +68,10 @@ public:
static void compose ( std::deque < sax::Token > & out, int primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/src/primitive/String.h b/alib2common/src/primitive/String.h
index 6be80b664e..9e4c166d79 100644
--- a/alib2common/src/primitive/String.h
+++ b/alib2common/src/primitive/String.h
@@ -69,6 +69,10 @@ public:
static void compose ( std::deque < sax::Token > & out, std::string primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/src/primitive/Unsigned.h b/alib2common/src/primitive/Unsigned.h
index 28fbb30607..22f5b22980 100644
--- a/alib2common/src/primitive/Unsigned.h
+++ b/alib2common/src/primitive/Unsigned.h
@@ -70,6 +70,10 @@ public:
static void compose ( std::deque < sax::Token > & out, unsigned primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/src/primitive/UnsignedLong.h b/alib2common/src/primitive/UnsignedLong.h
index da68b24e9e..807d6ab449 100644
--- a/alib2common/src/primitive/UnsignedLong.h
+++ b/alib2common/src/primitive/UnsignedLong.h
@@ -68,6 +68,10 @@ public:
static void compose ( std::deque < sax::Token > & out, unsigned long primitive );
virtual PrimitiveBase * inc ( ) &&;
+
+ virtual ObjectBase * normalize ( ) && {
+ return this;
+ }
};
} /* namespace primitive */
diff --git a/alib2common/test-src/core/DispatchTest.cpp b/alib2common/test-src/core/DispatchTest.cpp
index 04469720a6..1b12172eb1 100644
--- a/alib2common/test-src/core/DispatchTest.cpp
+++ b/alib2common/test-src/core/DispatchTest.cpp
@@ -67,6 +67,10 @@ public:
return m_data;
}
+ virtual TmpBase * normalize ( ) && {
+ return this;
+ }
+
};
class Tmp2 : public TmpBase {
@@ -119,6 +123,10 @@ public:
return m_data;
}
+ virtual TmpBase * normalize ( ) && {
+ return this;
+ }
+
};
class Tmp3 : public TmpBase {
@@ -174,6 +182,10 @@ public:
return m_data;
}
+ virtual TmpBase * normalize ( ) && {
+ return this;
+ }
+
};
// -------------------------------------------------------------------------------------------------------------------------------------------------------
--
GitLab