Changeset 1676 for code/branches/core3/src/core

Timestamp:

Aug 28, 2008, 11:50:53 PM (16 years ago)

Author:

landauf

Message:

a first test-version of my super-macro
tested with a testfunction in Projectile, just shoot to test
no idea if this works on other compilers (namely MSVC)

Location:

code/branches/core3/src/core

Files:

• ConfigFileManager.cc (modified) (1 diff)
• Factory.cc (modified) (1 diff)
• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (6 diffs)

code/branches/core3/src/core/ConfigFileManager.cc

@@ -327 +327 @@
         file.close();
 
-        COUT(3) << "Loaded config file \"" << this->filename_ << "\"." << std::endl;
+        COUT(0) << "Loaded config file \"" << this->filename_ << "\"." << std::endl;
 
         // Save the file in case something changed (like stripped whitespaces)

code/branches/core3/src/core/Factory.cc

@@ -98 +98 @@
         }
         (*getFactoryPointer()->identifierStringMap_.begin()).second->stopCreatingHierarchy();
+/*
+        for (it = Identifier::getIdentifierMapIntern().begin(); it != Identifier::getIdentifierMapIntern().end(); ++it)
+            (*it).second->createSuperFunctionCaller();
+*/
         COUT(3) << "*** Factory: Finished class-hierarchy creation" << std::endl;
     }

code/branches/core3/src/core/Identifier.cc

@@ -145 +145 @@
                 // Tell the parent we're one of it's direct children
                 (*it)->getDirectChildrenIntern().insert((*it)->getDirectChildrenIntern().end(), this);
+
+                // Create the super-function dependencies
+                (*it)->createSuperFunctionCaller();
             }
         }

code/branches/core3/src/core/Identifier.h

@@ -62 +62 @@
 #include "MetaObjectList.h"
 #include "Iterator.h"
+#undef SUPER_INTRUSIVE
+#include "Super.h"
 #include "util/Debug.h"
 #include "util/String.h"
@@ -224 +226 @@
             static Identifier* getIdentifierSingleton(const std::string& name, Identifier* proposal);
 
+            virtual void createSuperFunctionCaller() const = 0;
+
             /** @brief Returns the map that stores all Identifiers. @return The map */
             static std::map<std::string, Identifier*>& getIdentifierMapIntern();
@@ -229 +233 @@
             static std::map<std::string, Identifier*>& getLowercaseIdentifierMapIntern();
 
-            bool bCreatedOneObject_;                                       //!< True if at least one object of the given type was created (used to determine the need of storing the parents)
-            ObjectListBase* objects_;                                      //!< The list of all objects of this class
-
-        private:
             /** @brief Returns the children of the class the Identifier belongs to. @return The list of all children */
             inline std::set<const Identifier*>& getChildrenIntern() const { return (*this->children_); }
@@ -238 +238 @@
             inline std::set<const Identifier*>& getDirectChildrenIntern() const { return (*this->directChildren_); }
 
+            bool bCreatedOneObject_;                                       //!< True if at least one object of the given type was created (used to determine the need of storing the parents)
+            ObjectListBase* objects_;                                      //!< The list of all objects of this class
+
+        private:
             /**
                 @brief Increases the hierarchyCreatingCounter_s variable, causing all new objects to store their parents.
@@ -295 +299 @@
     class ClassIdentifier : public Identifier
     {
+        #define SUPER_INTRUSIVE_DECLARATION
+        #include "Super.h"
+
         public:
             static ClassIdentifier<T> *getIdentifier();
@@ -311 +318 @@
 
         private:
-            ClassIdentifier() {}
+            ClassIdentifier()
+            {
+                #define SUPER_INTRUSIVE_CONSTRUCTOR
+                #include "Super.h"
+            }
             ClassIdentifier(const ClassIdentifier<T>& identifier) {}    // don't copy
             ~ClassIdentifier() {}                                       // don't delete