Changeset 10363

Timestamp:

Apr 13, 2015, 11:15:04 PM (10 years ago)

Author:

landauf

Message:

bugfix: class hierarchy wrongly considered the classes of nested members as base classes of the surrounding class. this is now fixed by using RTTI (i.e. dynamic_cast). also added some tests.

Location:

code/branches/core7

Files:

• src/libraries/core/class/Identifier.cc (modified) (2 diffs)
• src/libraries/core/class/Identifier.h (modified) (3 diffs)
• src/libraries/core/class/IdentifierManager.cc (modified) (1 diff)
• test/core/CMakeLists.txt (modified) (1 diff)
• test/core/class/IdentifierNestedClassHierarchyTest.cc (added)

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -144 +144 @@
     /**
      * @brief Initializes the parents of this Identifier while creating the class hierarchy.
-     * @param identifiers All identifiers that were used to create an instance of this class (including this identifier itself)
+     * @param instance The instance that was used to determine the class hierarchy of this identifier.
+     * @param identifiers All identifiers that were used to create the instance of this class (including this identifier itself)
      */
-    void Identifier::initializeParents(const std::set<const Identifier*>& identifiers)
+    void Identifier::initializeParents(Identifiable* instance, const std::set<const Identifier*>& identifiers)
     {
         if (!IdentifierManager::getInstance().isCreatingHierarchy())
@@ -154 +155 @@
         }
 
+        // Add all identifiers which are real parents (dynamic_cast is possible) and that are not equal to THIS identifier.
+        // Checking for dynamic_cast is necessary because some classes may have other classes as nested members. This means that the Identifiers of the nested
+        // classes are also added to the set of potential parents. The only way to distinguish them is to use RTTI (i.e. dynamic_cast).
         for (std::set<const Identifier*>::const_iterator it = identifiers.begin(); it != identifiers.end(); ++it)
-            if (*it != this)
+            if (*it != this && (*it)->canDynamicCastObjectToIdentifierClass(instance))
                 this->parents_.insert(*it);
     }

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -148 +148 @@
             Identifier& inheritsFrom(Identifier* directParent);
 
-            void initializeParents(const std::set<const Identifier*>& identifiers);
+            void initializeParents(Identifiable* instance, const std::set<const Identifier*>& identifiers);
             void initializeDirectParentsOfAbstractClass();
             void finishInitialization();
@@ -223 +223 @@
             XMLPortObjectContainer* getXMLPortObjectContainer(const std::string& sectionname);
 
-            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) = 0;
+            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const = 0;
 
         protected:
@@ -290 +290 @@
                 { return this->typeidName_; }
 
-            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object)
+            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
                 { return dynamic_cast<T*>(object) != 0; }
 

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -122 +122 @@
                     if (temp->getIdentifier() != it->second)
                         orxout(internal_error) << "Newly created object of type " << it->second->getName() << " has unexpected identifier. Did you forget to use RegisterObject(classname)?" << endl;
+
+                    it->second->initializeParents(temp, this->identifiersOfNewObject_);
+
                     delete temp;
-
-                    it->second->initializeParents(this->identifiersOfNewObject_);
                 }
                 else

code/branches/core7/test/core/CMakeLists.txt

@@ -12 +12 @@
     class/IdentifierClassHierarchyTest.cc
     class/IdentifierSimpleClassHierarchyTest.cc
+    class/IdentifierNestedClassHierarchyTest.cc
     class/IdentifierExternalClassHierarchyTest.cc
     class/OrxonoxClassTest.cc