unirec++ - Add missing operators to UnirecArray::Iterator for random access support

Author: Pavel Siska

unirec/include/unirec++/unirecArray.hpp

@@ -26,7 +26,7 @@ namespace Nemea {
  *
  * @tparam T The type of the values in the array.
  */
-template<typename T>
+template <typename T>
 class UnirecArray {
 public:
 	/**
@@ -45,25 +45,63 @@ class UnirecArray {
 		{
 		}
 
+		// Dereference
 		reference operator*() const { return *m_ptr; }
-		pointer operator->() { return m_ptr; }
+		pointer operator->() const { return m_ptr; }
+
+		// Increment / Decrement
 		Iterator& operator++()
 		{
-			m_ptr++;
+			++m_ptr;
 			return *this;
 		}
-
 		Iterator operator++(int)
 		{
 			Iterator tmp = *this;
 			++(*this);
 			return tmp;
 		}
+		Iterator& operator--()
+		{
+			--m_ptr;
+			return *this;
+		}
+		Iterator operator--(int)
+		{
+			Iterator tmp = *this;
+			--(*this);
+			return tmp;
+		}
+
+		// Arithmetic
+		Iterator operator+(difference_type n) const { return Iterator(m_ptr + n); }
+		Iterator operator-(difference_type n) const { return Iterator(m_ptr - n); }
+		difference_type operator-(const Iterator& other) const { return m_ptr - other.m_ptr; }
+
+		Iterator& operator+=(difference_type n)
+		{
+			m_ptr += n;
+			return *this;
+		}
+		Iterator& operator-=(difference_type n)
+		{
+			m_ptr -= n;
+			return *this;
+		}
+
+		// Comparison
+		bool operator==(const Iterator& other) const { return m_ptr == other.m_ptr; }
+		bool operator!=(const Iterator& other) const { return m_ptr != other.m_ptr; }
+		bool operator<(const Iterator& other) const { return m_ptr < other.m_ptr; }
+		bool operator<=(const Iterator& other) const { return m_ptr <= other.m_ptr; }
+		bool operator>(const Iterator& other) const { return m_ptr > other.m_ptr; }
+		bool operator>=(const Iterator& other) const { return m_ptr >= other.m_ptr; }
 
-		T* data() { return m_ptr; }
+		// Indexing
+		reference operator[](difference_type n) const { return *(m_ptr + n); }
 
-		bool operator==(const Iterator& other) const { return this->m_ptr == other.m_ptr; };
-		bool operator!=(const Iterator& other) const { return this->m_ptr != other.m_ptr; };
+		// Data pointer access
+		pointer data() { return m_ptr; }
 
 	private:
 		pointer m_ptr;