Changeset 9701 in orxonox.OLD

Timestamp:

Aug 25, 2006, 11:20:21 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new safer concept for NewClassID

Location:

branches/new_class_id/src/lib/lang

Files:

• new_class_id.cc (modified) (2 diffs)
• new_class_id.h (modified) (2 diffs)
• new_object_list.cc (modified) (5 diffs)
• new_object_list.h (modified) (2 diffs)

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

@@ -17 +17 @@
 
 #include "new_class_id.h"
-
+#include "new_object_list.h"
 
 NewClassID::NewClassID()
@@ -24 +24 @@
 };
 
+NewClassID::NewClassID(const NewObjectListBase* objList)
+{
+
+  objList->acquireID(_id, _name);
+
+}
+
+
 NewClassID NullClass::_classID;

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

@@ -10 +10 @@
 #include <string>
 
+class NewObjectListBase;
+
 //! A class to dynamically allocate ClassID's and support a isA operator
 class NewClassID
@@ -15 +17 @@
 public:
   NewClassID();
-  NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
+  NewClassID(const NewObjectListBase* id);
   // the copy constructor is also defined.
-  const int& id() const { return _id; };
-  const std::string& name() const { return _name; };
+  const int& id() const { return *_id; };
+  const std::string& name() const { return *_name; };
 
-  bool operator==(NewClassID id) const { return _id == id._id || _name == id._name; };
-  bool operator==(int id) const { return _id == id; };
-  bool operator==(const std::string& name) const { return _name == name; };
-  bool operator!=(NewClassID id) const { return _id != id._id && _name != id._name; };
-  bool operator!=(int id) const { return _id != id; };
-  bool operator!=(const std::string& name) const { return _name != name; };
+  bool operator==(const NewClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
+  bool operator==(int id) const { return *_id == id; };
+  bool operator==(const std::string& name) const { return *_name == name; };
+  bool operator!=(const NewClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
+  bool operator!=(int id) const { return *_id != id; };
+  bool operator!=(const std::string& name) const { return *_name != name; };
 
 private:
-  int                _id;
-  std::string        _name;
+  const int*                _id;
+  const std::string*        _name;
 };
 

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

@@ -27 +27 @@
  */
 NewObjectListBase::NewObjectListBase(const std::string& className, int id)
+  : _name(className)
 {
   if (NewObjectListBase::_classesByID == NULL)
@@ -44 +45 @@
   assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
 
+  _id = id;
   /// Some Output, that will fall out later
   //std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
 
-  this->_identity = NewClassID(id, className);
+  this->_identity = NewClassID(this);
   (*NewObjectListBase::_classesByID)[this->_identity.id()] = this;
   (*NewObjectListBase::_classesByName)[this->_identity.name()] = this;
@@ -157 +159 @@
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getObject(int classID, const std::string& objectName)
+BaseObject* NewObjectListBase::getBaseObject(int classID, const std::string& objectName)
 {
   const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
@@ -172 +174 @@
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getObject(const std::string& className, const std::string& objectName)
+BaseObject* NewObjectListBase::getBaseObject(const std::string& className, const std::string& objectName)
 {
   const NewObjectListBase* const base = NewObjectListBase::getObjectList(className);
@@ -187 +189 @@
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getObject(const NewClassID& classID, const std::string& objectName)
+BaseObject* NewObjectListBase::getBaseObject(const NewClassID& classID, const std::string& objectName)
 {
   const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);

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

@@ -51 +51 @@
 
 public:
-  inline const NewClassID& identity() const { return _identity; };
-  inline int id() const { return _identity.id(); };
-  inline const std::string& name() const { return _identity.name(); };
-  bool operator==(int id) const { return _identity == id; };
-  bool operator==(const NewClassID& id) const { return _identity == id; };
-  bool operator==(const std::string& name) const { return _identity == name; };
+  inline const NewClassID& identity() const { return _identity; }
+  inline int id() const { return _id; };
+  inline const std::string& name() const { return _name; };
+  bool operator==(int id) const { return _id == id; };
+  bool operator==(const NewClassID& id) const { return id == _id; };
+  bool operator==(const std::string& name) const { return _name == name; };
+
+  void acquireID(const int*& id, const std::string*& name) const { id = &_id; name = &_name; };
 
   virtual void debug() const = 0;
@@ -130 +132 @@
   typedef std::map<std::string, NewObjectListBase*> classNameMap; //!< The Generic Map.
 
-  NewClassID                    _identity;          //!< The Identity of the Class (ID and Name).
+  int                           _id;
+  const std::string             _name;              //!< The Name of the Class.
+  NewClassID                    _identity;          //!< The Identity of the Class. (equal to _id and _name)
 
 private: