From 988b0927784f024686080380bcaf5c89b0a0417c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 16 Apr 2015 01:47:02 +0100
Subject: [PATCH] actually working comparisons

---
 octa/range.h  | 10 ----------
 octa/vector.h | 36 +++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/octa/range.h b/octa/range.h
index f151b93..ac984be 100644
--- a/octa/range.h
+++ b/octa/range.h
@@ -94,16 +94,6 @@ namespace octa {
         RangeIterator<T<U>> end() {
             return RangeIterator<T<U>>();
         }
-
-        template<typename V>
-        friend bool operator==(const T<U> &a, const T<V> &b) {
-            return a.equals(b);
-        }
-
-        template<typename V>
-        friend bool operator!=(const T<U> &a, const T<V> &b) {
-            return !a.equals(b);
-        }
     };
 }
 
diff --git a/octa/vector.h b/octa/vector.h
index af0f1dd..4da9957 100644
--- a/octa/vector.h
+++ b/octa/vector.h
@@ -15,6 +15,10 @@
 #include "octa/range.h"
 
 namespace octa {
+    /* Implementation of vector ranges
+     *
+     * See the range specification as documented on OctaForge wiki.
+     */
     template<typename T>
     struct VectorRange: Range<VectorRange, T> {
         struct type {
@@ -26,45 +30,47 @@ namespace octa {
 
         VectorRange(): p_beg(nullptr), p_end(nullptr) {}
         VectorRange(const VectorRange &v): p_beg(v.p_beg), p_end(v.p_end) {}
+        VectorRange(VectorRange &&v): p_beg(v.p_beg), p_end(v.p_end) {
+            v.p_beg = v.p_end = nullptr;
+        }
         VectorRange(T *beg, T *end): p_beg(beg), p_end(end) {}
 
         /* satisfy InputRange */
-
         bool empty() const { return p_beg == nullptr; }
 
-        T &first() { return *p_beg; }
-        const T &first() const { return *p_beg; }
-
         void pop_first() {
             if (p_beg == nullptr) return;
             if (++p_beg == p_end) p_beg = p_end = nullptr;
         }
 
-        template<typename U> bool equals(const VectorRange<U> &v) const {
+              T &first()       { return *p_beg; }
+        const T &first() const { return *p_beg; }
+
+        bool operator==(const VectorRange &v) {
             return p_beg == v.p_beg && p_end == v.p_end;
         }
+        bool operator!=(const VectorRange &v) {
+            return p_beg != v.p_beg || p_end != v.p_end;
+        }
 
         /* satisfy ForwardRange */
-
         VectorRange save() { return *this; }
 
         /* satisfy BidirectionalRange */
-
-        T &last() { return *(p_end - 1); }
-        const T &last() const { return *(p_end - 1); }
-
         void pop_last() {
             if (p_end-- == p_beg) { p_end = nullptr; return; }
             if (p_end   == p_beg) p_beg = p_end = nullptr;
         }
 
+              T &last()       { return *(p_end - 1); }
+        const T &last() const { return *(p_end - 1); }
+
         /* satisfy RandomAccessRange */
-
-        T &operator[](size_t i) { return p_beg[i]; }
-        const T &operator[](size_t i) const { return p_beg[i]; }
-
         size_t length() const { return p_end - p_beg; }
 
+              T &operator[](size_t i)       { return p_beg[i]; }
+        const T &operator[](size_t i) const { return p_beg[i]; }
+
     private:
         T *p_beg, *p_end;
     };
@@ -87,7 +93,7 @@ namespace octa {
             typedef ptrdiff_t difference;
         };
 
-        explicit Vector(): p_buf(nullptr), p_len(0), p_cap(0) {}
+        Vector(): p_buf(nullptr), p_len(0), p_cap(0) {}
 
         explicit Vector(size_t n, const T &val = T()): Vector() {
             p_buf = new uchar[n * sizeof(T)];