* iterator refactoring

adamnemecek · adamnemecek · commit 316bffdf1e11 · 2017-01-15T14:56:46.000-08:00
diff --git a/Sources/DoublyLinkedList.swift b/Sources/DoublyLinkedList.swift
@@ -167,11 +167,10 @@ public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {
     public func makeIterator() -> DoublyLinkedList.Iterator {
         var it = head
         return AnyIterator {
-            guard let e = it?.element else {
-                return nil
-            }
+          defer {
             it = it?.next
-            return e
+          }
+          return it?.element
 		}
 	}
 
diff --git a/Sources/RedBlackTree.swift b/Sources/RedBlackTree.swift
@@ -158,15 +158,8 @@ public struct RedBlackTree<Key: Comparable, Value>: Probable, Collection, Custom
 	//	:returns:	RedBlackTree.Generator
 	//
 	public func makeIterator() -> RedBlackTree.Iterator {
-        var index = startIndex
-        return AnyIterator {
-            if index < self.endIndex {
-                let i: Int = index
-                index += 1
-                return self[i]
-            }
-            return nil
-        }
+        var i = indices.makeIterator()
+        return AnyIterator { i.next().map { self[$0] } }
 	}
 
 	/**
diff --git a/Sources/SortedDictionary.swift b/Sources/SortedDictionary.swift
@@ -120,14 +120,8 @@ public struct SortedDictionary<Key: Comparable, Value>: Probable, Collection, Eq
 	}
 	
 	public func makeIterator() -> SortedDictionary.Iterator {
-		var index = startIndex
-    return AnyIterator {
-      guard index < self.endIndex else { return nil }
-      defer {
-        index += 1
-      }
-      return self[index]
-		}
+    var i = indices.makeIterator()
+    return AnyIterator { i.next().map { self[$0] } }
 	}
 	
 	/**
diff --git a/Sources/SortedMultiDictionary.swift b/Sources/SortedMultiDictionary.swift
@@ -120,15 +120,8 @@ public struct SortedMultiDictionary<Key: Comparable, Value>: Probable, Collectio
     }
     
     public func makeIterator() -> SortedMultiDictionary.Iterator {
-        var index = startIndex
-        return AnyIterator {
-            if index < self.endIndex {
-                let i: Int = index
-                index += 1
-                return self[i]
-            }
-            return nil
-        }
+        var i = indices.makeIterator()
+        return AnyIterator { i.next().map { self[$0] } }
     }
     
     /**
diff --git a/Sources/SortedMultiSet.swift b/Sources/SortedMultiSet.swift
@@ -157,15 +157,8 @@ public struct SortedMultiSet<T: Comparable>: Probable, Collection, Equatable, Cu
 	//	:returns:	SortedMultiSet.Generator
 	//	
 	public func makeIterator() -> SortedMultiSet.Iterator {
-        var index = startIndex
-        return AnyIterator {
-            if index < self.endIndex {
-                let i = index
-                index += 1
-                return self[i]
-            }
-            return nil
-        }
+        var i = indices.makeIterator()
+        return AnyIterator { i.next().map { self[$0] } }
 	}
 
     /**
diff --git a/Sources/SortedSet.swift b/Sources/SortedSet.swift
@@ -137,10 +137,8 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 	}
 
 	public func makeIterator() -> SortedSet.Iterator {
-        var i = indices.makeIterator()
-        return AnyIterator {
-            i.next().map { self[$0] }
-        }
+      var i = indices.makeIterator()
+      return AnyIterator { i.next().map { self[$0] } }
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -167,11 +167,10 @@ public struct DoublyLinkedList<Element>: CustomStringConvertible, Sequence {`
`167`	`167`	`public func makeIterator() -> DoublyLinkedList.Iterator {`
`168`	`168`	`var it = head`
`169`	`169`	`return AnyIterator {`
`170`		`- guard let e = it?.element else {`
`171`		`- return nil`
`172`		`- }`
	`170`	`+ defer {`
`173`	`171`	`it = it?.next`
`174`		`- return e`
	`172`	`+ }`
	`173`	`+ return it?.element`
`175`	`174`	`}`
`176`	`175`	`}`
`177`	`176`
Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,8 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public func makeIterator() -> SortedSet.Iterator {`
`140`		`- var i = indices.makeIterator()`
`141`		`- return AnyIterator {`
`142`		`- i.next().map { self[$0] }`
`143`		`- }`
	`140`	`+ var i = indices.makeIterator()`
	`141`	`+ return AnyIterator { i.next().map { self[$0] } }`
`144`	`142`	`}`
`145`	`143`
`146`	`144`	`/**`