refactored m_end variable from previos commit to a variable called m_mode of type iteration_mode

Author: tiberius

cpp4j/tree.h

@@ -39,7 +39,7 @@ template <class T, template<class> class Order = Less > class Tree {
                 break;
         }
 
-        return iterator (node, this, node == NULL);
+        return iterator (node, this, node != NULL ? iterator::begin : iterator::end);
     }
 
     // highest key
@@ -52,7 +52,7 @@ template <class T, template<class> class Order = Less > class Tree {
                 break;
         }
 
-        return iterator (node, this, true);
+        return iterator (node, this, iterator::end);
     }
 
     /*iterator first();

cpp4j/treeiterator.h

@@ -21,9 +21,11 @@ template <class T, template<typename> class Order > class TreeIterator {
 
     // zum nächsten Element
     TreeIterator<T, Order>& operator++() {
-        if (m_node == NULL || m_end)
+        if (m_node == NULL || m_mode == end)
             return *this;
 
+        m_mode = middle;
+
         if (m_node->m_right != NULL) {
             m_node = m_node->m_right;
             while (m_node->m_left != NULL)
@@ -47,7 +49,7 @@ template <class T, template<typename> class Order > class TreeIterator {
                 node = node->m_up;
 
                 if (node->m_up == NULL) { // reached root, nothing else to do
-                    m_end = true;
+                    m_mode = end;
                     return *this;
                 }
 
@@ -59,18 +61,19 @@ template <class T, template<typename> class Order > class TreeIterator {
 
         }
 
-        m_end = true;
+        m_mode = end;
         return *this;
 
     }
 
     // zum vorherigen Element
     TreeIterator<T, Order>& operator--() {
+        //if (m_node == NULL || !m_end)
         return *this;
     }
 
     bool operator==(const TreeIterator<T, Order> &rhs) const {
-        return this->m_node == rhs.m_node && this->m_tree == rhs.m_tree && this->m_end == rhs.m_end;
+        return this->m_node == rhs.m_node && this->m_tree == rhs.m_tree && this->m_mode == rhs.m_mode;
     }
 
     bool operator!=(const TreeIterator<T, Order> &rhs) const {
@@ -79,18 +82,19 @@ template <class T, template<typename> class Order > class TreeIterator {
 
 protected:
 
+    enum iteration_mode { begin, middle, end };
+    iteration_mode m_mode;
+
     TreeIterator(TreeNode<T, Order> * node, const Tree<T, Order> * tree)
-        : m_node(node), m_tree(tree), m_end(false) {}
+        : m_node(node), m_tree(tree), m_mode(middle) {}
 
-    TreeIterator(TreeNode<T, Order> * node, const Tree<T, Order> * tree, const bool end)
-        : m_node(node), m_tree(tree), m_end(end) {}
+    TreeIterator(TreeNode<T, Order> * node, const Tree<T, Order> * tree, const iteration_mode mode)
+        : m_node(node), m_tree(tree), m_mode(mode) {}
 
 private:
 
     TreeNode<T, Order> * m_node;
     const Tree<T, Order> * m_tree;
-    bool m_end;
-
 };
 
 #endif // TREEITERATOR_H