1 files changed, 10 insertions, 22 deletions
diff --git a/include/GenericsLibrary/iterator.nhh b/include/GenericsLibrary/iterator.nhh
index e509bc2..ecc82ed 100644
--- a/include/GenericsLibrary/iterator.nhh
+++ b/include/GenericsLibrary/iterator.nhh
@@ -24,38 +24,26 @@ trait iterator_traits
 
 impl iterator : trait iterator_traits
 {
-    let init()
+    let begin(let self)
     {
-        return 0;
-    }
-
-    let dispose()
-    {
-        return 0;
-    }
-
-    let begin()
-    {
-	must_pass(_begin != _end);
+	    must_pass(self._begin != self._end);
 	
-        let end := _begin;
-        return end;
+        let begin := self._begin;
+        return begin;
     }
 
-    let end()
+    let end(let self)
     {
-	must_pass(_begin != _end);
+	    must_pass(_begin != _end);
 	
-        let end :=_begin;
-        end += _end;
-
+        let end := self._end;
         return end;
     }
 
-    let size()
+    let size(let self)
     {
-	must_pass(_size > 0);
-        return _size;
+	    must_pass(self._size > 0);
+        return self._size;
     }
 };