diff --git a/alib2common/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h
index 0433b462c49f848a7615c14261e14bb609e4185b..5ae4b7d699b8226c425b373a22b0a648fd0f83cc 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 e886a2d510773cd9471e2cb99a971730c3596c3b..ca092180461b4af367c14928a4898a95ffb60553 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 20770ec39f4967f8dc67a6e6bc2314810ca5062b..44735e5b5330b9f0e09c08abcfbac35bea2d219c 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 8f699e736d3acb6f5a3cecaea2679f00272b102d..c2cbcc2f322c1f1c8d17297fe5b1975a72fe55aa 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 953e9bb12801bd29578a69667a14b2fb890acadd..acf734f329d964de157efac6cdf11e148f17f024 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 edde9ad250fd45c706b80f4e633f5508695f71eb..3b13bce3723dd8f3c36c8bfcec4133e9ed74543a 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 058676c5a558e69212d52f0bb3b88789f36499d3..0ce858dc0280b9c724278cdd43b3fda76db44657 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 c183823bb6ed4b00b39e793d435b447215b4c548..1a7dd5de689605f2850e5429a0a9241f86dfd120 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 5205c4fcc4ff9635a48571f452c33320636f20b1..9fac25144f4f7ec65b389ce90399f742fe481dee 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 c44761d97c4c2a4d84a826c8bdaeda8636ecbcd0..534b87f51bf61c2ef12e7e879dc7a13c6f0062e1 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 9b0c5c82716b3016bfdf39692029a7e7c7d2db82..ecca743262cc60228b3316ef180f84e435217d96 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 d4dd7c90b290b91fac9cdcf93d0aade0326b311d..5a1fd71242740d86364ffe0d401c219da9e28e23 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 6cc393e0b7cfcc7017f1a06a2659ee172105d4c5..70f29fe6056e30ad67abc64f467f55b54a6b2af0 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 7d46b79c7210628c18b7759562976a4f02777ad2..8ed29bec4cf8ce028ce1f13b918c36a09912d3ab 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 08621cc983cb7f8ba2dd393ad6f5ebd2af6ef753..1e1aaf0e9ff7f63962d8474802d9a531daa9da4a 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 6be80b664efd8001e3da66d06a860999df9fbc68..9e4c166d799f84894874358bdbd0e5a37cb4883f 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 28fbb30607eed8df95aaf4d9476b985f79275f1c..22f5b22980dc2589cffb17b739f91c09b2faeb10 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 da68b24e9eda77b1e920e63bb2dd7755fef6f3aa..807d6ab449ab51219b44621ee05629ec7642a1f4 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 04469720a621764501ef3ab9edf5b97b14420174..1b12172eb1d1b2dcb6d5d1a242225df070409025 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;
+ }
+
};
// -------------------------------------------------------------------------------------------------------------------------------------------------------