Changeset 5110 in orxonox.OLD for trunk/src/lib/util/list.h

Timestamp:

Aug 23, 2005, 11:07:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: changed the behaviour of the iterator.
Now it is soon possible to walk through a List from front and back, and tell the Iterator from where to seek

@patrick: i had to disable your Collision-Detection algorithms, because they had a seekElement inside, that i did not entirely grasp the meaning of….
trying to fix this now

File:

• trunk/src/lib/util/list.h (modified) (5 diffs)

trunk/src/lib/util/list.h

@@ -12 +12 @@
 #endif
 
-
+template<class T> class tIterator;
 
 //! a list element of the tList,
@@ -23 +23 @@
 
 /**
- *  an iterator class
-
-   this enables the user to iterate through a list very easely
-*/
-template<class T> class tIterator
-{
- public:
-  tIterator(listElement<T>* startElement);
-  ~tIterator();
-
-  T* nextElement();
-  T* seekElement(T* element);
-
- private:
-  listElement<T>*    currentEl;                      //!< pointer to the current list element in the iterator
-  listElement<T>*    tmpEl;                          //!< temp listElemnt pointer
-  listElement<T>*    startElement;                   //!< pointer to the start of the list
-};
-
-
-/**
- *  iterator constructor
- * @param startElement:  the first list element from the tList
-
-   normaly you will use it like this:
-
-   tIterator<char>* nameIterator = nameList->getIterator();
-   char name* = nameIterator->nextElement();
-   while( name != NULL)
-   {
-     PRINTF(3)("found name: %s in list\n", name);
-     name = nameIterator->nextElement();
-   }
-   delete nameIterator;
-*/
-template<class T>
-inline tIterator<T>::tIterator (listElement<T>* startElement)
-{
-  this->currentEl = startElement;
-  this->tmpEl = NULL;
-  this->startElement = startElement;
-}
-
-
-/**
- *  the destructor
-*/
-template<class T>
-inline tIterator<T>::~tIterator ()
-{
-  this->currentEl = NULL;
-}
-
-
-/**
- *  use it to iterate through the list
- * @returns next list element
-*/
-template<class T>
-inline T* tIterator<T>::nextElement ()
-{
-  if( this->currentEl == NULL)
-    return NULL;
-
-  this->tmpEl = this->currentEl;
-  this->currentEl = this->currentEl->next;
-  return this->tmpEl->curr;
-}
-
-/**
- *  gets the element after the selected one, sets the iterator to this point in the list
- * @param element the element to seek
- * @returns next list element
-
-  Attention: if you seek an element, the iterator pointer will point to the NEXT listelement after the argument!
- */
-template<class T>
-inline T* tIterator<T>::seekElement (T* element)
-{
-  for(this->tmpEl = this->startElement; this->tmpEl != NULL; this->tmpEl = this->tmpEl->next)
-  {
-    if( unlikely(this->tmpEl->curr == element))
-    {
-      if( this->tmpEl->next != NULL)
-      {
-        this->currentEl = this->tmpEl->next->next;
-        return this->tmpEl->next->curr;
-      }
-      return NULL;
-    }
-  }
-  return NULL;
-}
-
-
-
-/**
  *  the list template class
 
@@ -126 +29 @@
 template<class T> class tList
 {
+  friend class tIterator<T>;
+
  public:
   tList ();
@@ -374 +279 @@
 inline tIterator<T>* tList<T>::getIterator() const
 {
-  tIterator<T>* iterator = new tIterator<T>(this->first);
-  return iterator;
+  return new tIterator<T>(this);
 }
 
@@ -414 +318 @@
 }
 
+
+
+
+/**
+ *  an iterator class
+
+   this enables the user to iterate through a list very easely
+ */
+template<class T> class tIterator
+{
+  public:
+    tIterator(const tList<T>* list);
+    ~tIterator();
+
+    T* firstElement();
+    T* nextElement();
+    T* seekElement(T* element);
+
+  private:
+    listElement<T>*    currentEl;                      //!< pointer to the current list element in the iterator
+    listElement<T>*    tmpEl;                          //!< temp listElemnt pointer
+    const tList<T>*    list;                           //!< The List, that we want to iterate through
+};
+
+
+/**
+ *  iterator constructor
+ * @param startElement:  the first list element from the tList
+
+   normaly you will use it like this:
+
+   tIterator<char>* nameIterator = nameList->getIterator();
+                char name* = nameIterator->nextElement();
+                while( name != NULL)
+{
+                PRINTF(3)("found name: %s in list\n", name);
+                name = nameIterator->nextElement();
+}
+                delete nameIterator;
+ */
+                template<class T>
+                inline tIterator<T>::tIterator (const tList<T>* list)
+{
+  this->currentEl = list->first;
+  this->tmpEl = NULL;
+  this->list = list;
+}
+
+
+/**
+ *  the destructor
+ */
+template<class T>
+    inline tIterator<T>::~tIterator ()
+{
+  this->currentEl = NULL;
+}
+
+template<class T>
+    inline T* tIterator<T>::firstElement ()
+{
+  this->currentEl = this->list->first;
+  if (this->currentEl == NULL)
+    return NULL;
+  else
+    return this->currentEl->curr;
+}
+
+
+/**
+ *  use it to iterate through the list
+ * @returns next list element
+ */
+template<class T>
+    inline T* tIterator<T>::nextElement ()
+{
+  if( this->currentEl == NULL || this->currentEl->next == NULL)
+  {
+    this->currentEl = NULL;
+    return NULL;
+  }
+
+  this->currentEl = this->currentEl->next;
+  return this->currentEl->curr;
+}
+
+/**
+ *  gets the element after the selected one, sets the iterator to this point in the list
+ * @param element the element to seek
+ * @returns next list element
+
+  Attention: if you seek an element, the iterator pointer will point to the NEXT listelement after the argument!
+ */
+template<class T>
+    inline T* tIterator<T>::seekElement (T* element)
+{
+  for(this->tmpEl = this->list->first; this->tmpEl != NULL; this->tmpEl = this->tmpEl->next)
+  {
+    if( unlikely(this->tmpEl->curr == element))
+    {
+      if( this->tmpEl->next != NULL)
+      {
+        this->currentEl = this->tmpEl;
+        return this->tmpEl->next->curr;
+      }
+      return NULL;
+    }
+  }
+  return NULL;
+}
+
 #endif /* _LIST_H */