Changeset 9678 in orxonox.OLD for trunk

Timestamp:

Aug 21, 2006, 11:59:18 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented isA leafID and listInheritance

Location:

trunk/src/lib/lang

Files:

• new_class_id.cc (modified) (2 diffs)
• new_class_id.h (modified) (3 diffs)
• test_object_list.cc (modified) (3 diffs)

trunk/src/lib/lang/new_class_id.cc

@@ -18 +18 @@
 #include "new_class_id.h"
 #include <cassert>
+#include "debug.h"
 
 ///////////////////////////////////////////////////////////
@@ -45 +46 @@
 
 
+/**
+ * @brief Seeks in the Inheritance if it matches objectList.
+ * @param objectList The ObjectList this should be a member of (by Pointer-comparison).
+ * @return True if found, false if not.
+ */
+bool NewClassID::isA(const NewObjectListBase& objectList) const
+{
+  ClassList::const_iterator it;
+  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
+    if ((*it)._objectList == &objectList)
+      return true;
+  return false;
+}
+
+/**
+ * @brief Seeks in the Inheritance if it matches objectList.
+ * @param classID The ClassID of the class this should be a member of.
+ * @return True if found, false if not.
+ */
+bool NewClassID::isA(int classID) const
+{
+  ClassList::const_iterator it;
+  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
+    if (*(*it)._objectList == classID)
+      return true;
+  return false;
+}
+
+/**
+ * @brief Seeks in the Inheritance if it matches objectList.
+ * @param className The ClassName of the class this should be a member of.
+ * @return True if found, false if not.
+ */
+bool NewClassID::isA(const std::string& className) const
+{
+  ClassList::const_iterator it;
+  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
+    if (*(*it)._objectList == className)
+      return true;
+  return false;
+}
+
+
+void NewClassID::listInheritance() const
+{
+  PRINT(0)("Listing inheritance diagram for ....: ");
+  ClassList::const_iterator it;
+  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
+    PRINT(0)(" -> %s", (*it)._objectList->name().c_str());
+  PRINT(0)("\n");
+
+}

trunk/src/lib/lang/new_class_id.h

@@ -24 +24 @@
 
 
+  int leafClassID() const { return _classes.front()._objectList->id(); }
+
   template<class T> void registerObject(T* object, NewObjectList<T>& list);
   bool isA(const NewObjectListBase& objectList) const;
-  bool isA(int id) const;
+  bool isA(int classID) const;
   bool isA(const std::string& className) const;
 
+  void listInheritance() const;
+
 private:
-
   //////////////////////////////
   //// Type Definition Part ////
   //////////////////////////////
   //! A ClassEntry so we can store Classes inside of Objects
-  struct ClassEntry{
+  struct ClassEntry
+  {
     /** Simple Constuctor @param objectList the NewObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
     inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
@@ -42 +46 @@
   };
   typedef std::list<ClassEntry>        ClassList;   //!< Type definition for the List.
+
   ClassList                           _classes;     //!< All Classes this object is part of.
 };
@@ -56 +61 @@
  */
 template<class T>
-    inline void NewClassID::registerObject(T* object, NewObjectList<T>& objectList)
+inline void NewClassID::registerObject(T* object, NewObjectList<T>& objectList)
 {
-  this->_classes.push_back(ClassEntry(&objectList, objectList.registerObject(object)));
+  this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
 }
 

trunk/src/lib/lang/test_object_list.cc

@@ -12 +12 @@
   //   bool operator==(const std::string& name) const { return _objectName == name; };
 
-  //  NewObjectListDeclaration(NewBaseObject);
+    NewObjectListDeclaration(NewBaseObject);
 
 protected:
   NewBaseObject(const std::string& objectName = "") : _objectName(objectName)
   {
-    //    this->registerObject(this, objectList);
+       this->registerObject(this, objectList);
   };
   template<class T>
   inline void registerObject(T* object, NewObjectList<T>& objectList) { _id.registerObject(object, objectList); };
-private:
+protected:
   NewClassID    _id;
   std::string   _objectName;
@@ -27 +27 @@
 
 };
-//NewObjectListDefinition(NewBaseObject);
+NewObjectListDefinition(NewBaseObject);
 
 
@@ -43 +43 @@
   //ObjectListDeclaration(Test);
 };
-NewObjectListDefinitionID(Test, 0);
+NewObjectListDefinitionID(Test, -1);
 
 Test::Test()
 {
   this->registerObject(this, Test::objectList);
+
+  this->_id.listInheritance();
+
 //  this->setClassID(CL_PARENT_NODE, "Test");
   // std::cout << "Test()\n";