Changeset 9726 in orxonox.OLD

Timestamp:

Sep 9, 2006, 7:42:16 PM (18 years ago)

Author:

bensch

Message:

stuff from yesterday

Location:

branches/new_class_id/src/lib/lang

Files:

• object_list.cc (modified) (8 diffs)
• object_list.h (modified) (6 diffs)

branches/new_class_id/src/lib/lang/object_list.cc

@@ -19 +19 @@
 #include <cassert>
 
-
-#include <stdio.h>
-
 /**
  * @brief Constructor, that creates an ObjectList while checking (development mode) for uniqueness of all Keys (names and ID's)
@@ -33 +30 @@
   if (ObjectListBase::_classesByID == NULL)
   {
-    ObjectListBase::_classesByID = new classIDMap;
+    ObjectListBase::_classesByID = new IDMap;
     assert (ObjectListBase::_classesByName == NULL);
-    ObjectListBase::_classesByName = new classNameMap;
+    ObjectListBase::_classesByName = new NameMap;
   }
   assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
@@ -83 +80 @@
 }
 
-ObjectListBase::classIDMap* ObjectListBase::_classesByID = NULL;
-ObjectListBase::classNameMap* ObjectListBase::_classesByName = NULL;
+ObjectListBase::IDMap* ObjectListBase::_classesByID = NULL;
+ObjectListBase::NameMap* ObjectListBase::_classesByName = NULL;
 std::list<std::string> ObjectListBase::_classNames;
 
@@ -156 +153 @@
 {
   assert (ObjectListBase::_classesByID != NULL);
-  ObjectListBase::classIDMap::iterator it = ObjectListBase::_classesByID->find(classID);
+  ObjectListBase::IDMap::iterator it = ObjectListBase::_classesByID->find(classID);
   if (it != ObjectListBase::_classesByID->end())
     return (*it).second;
@@ -171 +168 @@
 {
   assert (ObjectListBase::_classesByName != NULL);
-  ObjectListBase::classNameMap::iterator it = ObjectListBase::_classesByName->find(className);
+  ObjectListBase::NameMap::iterator it = ObjectListBase::_classesByName->find(className);
   if (it != ObjectListBase::_classesByName->end())
     return (*it).second;
@@ -243 +240 @@
     ObjectListBase::_classNames.clear();
 
-    for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
-         it != ObjectListBase::_classesByName->end();
-         ++it)
-    {
+    for (NameMap::const_iterator it = ObjectListBase::_classesByName->begin();
+         it != ObjectListBase::_classesByName->end();
+         ++it)
       ObjectListBase::_classNames.push_back((*it).second->name());
-    }
   }
   return ObjectListBase::_classNames;
@@ -294 +289 @@
   printf("Listing all %d ObjectLists \n", ObjectListBase::_classesByID->size());
 
-  for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
+  for (NameMap::const_iterator it = ObjectListBase::_classesByName->begin();
        it != ObjectListBase::_classesByName->end();
        ++it)
-  {
     (*it).second->debug(level);
-
-  }
-
 }
 
@@ -339 +330 @@
     return -1;
 }
-

branches/new_class_id/src/lib/lang/object_list.h

@@ -9 +9 @@
 
 #include "class_id.h"
-#include <cassert>
 #include <map>
 #include <list>
 #include <string>
+
+#include <cassert>
 #include <iostream>
 
@@ -101 +102 @@
   static int                            StringToID(const std::string& className);
 
-  //! Only uset to unsubscribe a BaseObject.
+  //! Only used to unsubscribe a BaseObject. (just try to make a valid iterator, stupid :))
   virtual void                          unregisterObject(IteratorBase* _iterators) = 0;
 
@@ -117 +118 @@
 
 protected:
-  typedef std::map<int, ObjectListBase*>         classIDMap;   //!< The Generic Map.
-  typedef std::map<std::string, ObjectListBase*> classNameMap; //!< The Generic Map.
+  typedef std::map<int, ObjectListBase*>         IDMap;   //!< The Generic Map.
+  typedef std::map<std::string, ObjectListBase*> NameMap; //!< The Generic Map.
 
 private:
@@ -126 +127 @@
 
 private:
-  static classIDMap*            _classesByID;       //!< A Map of all the classes in existance.
-  static classNameMap*          _classesByName;     //!< A Map of all the classes in existance.
+  static IDMap*                 _classesByID;       //!< A Map of all the classes in existance.
+  static NameMap*               _classesByName;     //!< A Map of all the classes in existance.
   static std::list<std::string> _classNames;        //!< A list of all the registered ClassNames.
 };
@@ -135 +136 @@
 //// TEMPLATISATION /////
 /////////////////////////
-//! Defines a ObjectsList handler for objects of type T.
+//! Defines a ObjectList handler for objects of type T.
 /**
  * The ObjectList is a generic way to store every object created from a Class 'T'
- *  into a List. The list can be retrieved, and used constantly over iterators,
+ *  in a List. The list can be retrieved, and used constantly over iterators,
  *  as with normal std::list.
  *
  * Furthermore the linkage over the single Lists is given over the Superclass ObjectListBase.
  *
- *
- *
+ * The approach of ObjectList is an intrusive one, meaning, that each Class that wants to
+ * support it must implement a Declaration and a Definition for the ObjectList, as mentioned
+ * in the next statement:
  *
  * To define a Class with a ObjectList, you have to:
@@ -152 +154 @@
  *
  * @note The Class must define the compare with const std::string& operator for this to work.
+ *  The operator==(const std::string& name) should compare the object's name with name.
  *
  *