* some refactoring

adamnemecek · adamnemecek · commit cabc583d105c · 2017-01-15T14:49:14.000-08:00
diff --git a/Sources/Algorithm+Array.swift b/Sources/Algorithm+Array.swift
@@ -37,10 +37,7 @@ extension Array where Element: Equatable {
      */
     @discardableResult
     mutating func remove(object: Element) -> Element? {
-        guard let v = index(of: object) else {
-            return nil
-        }
-        return remove(at: v)
+      return index(of: object).map { self.remove(at: $0) }
 	}
 
     /**
@@ -82,10 +79,8 @@ extension Array where Element: Equatable {
     public func count(of elements: [Element]) -> Int {
 		var c = 0
         for e in elements {
-            for x in self {
-                if e == x {
-                    c += 1
-                }
+            for x in self where e == x {
+                c += 1
             }
         }
 		return c
diff --git a/Sources/SortedDictionary.swift b/Sources/SortedDictionary.swift
@@ -89,20 +89,12 @@ public struct SortedDictionary<Key: Comparable, Value>: Probable, Collection, Eq
 	
 	//github.com/ Retrieves an Array of the key values in order.
 	public var keys: [Key] {
-		var s = [Key]()
-		for x in self {
-			s.append(x.key)
-		}
-		return s
+		return map { $0.key }
 	}
 	
 	//github.com/ Retrieves an Array of the values that are sorted based
 	public var values: [Value] {
-		var s = [Value]()
-		for x in self {
-			s.append(x.value!)
-		}
-		return s
+		return flatMap { $0.value }
 	}
 	
 	//github.com/ Initializer.
@@ -129,13 +121,12 @@ public struct SortedDictionary<Key: Comparable, Value>: Probable, Collection, Eq
 	
 	public func makeIterator() -> SortedDictionary.Iterator {
 		var index = startIndex
-        return AnyIterator {
-			if index < self.endIndex {
-				let i: Int = index
-				index += 1
-				return self[i]
-			}
-			return nil
+    return AnyIterator {
+      guard index < self.endIndex else { return nil }
+      defer {
+        index += 1
+      }
+      return self[index]
 		}
 	}
 	
diff --git a/Sources/SortedMultiDictionary.swift b/Sources/SortedMultiDictionary.swift
@@ -89,20 +89,12 @@ public struct SortedMultiDictionary<Key: Comparable, Value>: Probable, Collectio
     
     //github.com/ Retrieves an Array of the key values in order.
     public var keys: [Key] {
-        var s = [Key]()
-        for x in self {
-            s.append(x.key)
-        }
-        return s
+        return map { $0.key }
     }
     
     //github.com/ Retrieves an Array of the values that are sorted based
     public var values: [Value] {
-        var s = [Value]()
-        for x in self {
-            s.append(x.value!)
-        }
-        return s
+        return flatMap { $0.value }
     }
     
     //github.com/ Initializer.
diff --git a/Sources/SortedSet.swift b/Sources/SortedSet.swift
@@ -58,11 +58,7 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 		:name:	asArray
 	*/
 	public var asArray: [Element] {
-		var a = [Element]()
-		for x in self {
-			a.append(x)
-		}
-		return a
+    return map { $0 }
 	}
 	
 	/**
@@ -72,15 +68,7 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 		- returns:	String
 	*/
 	public var description: String {
-		var output = "["
-		let l = count - 1
-		for i in 0..<count {
-			output += "\(self[i])"
-			if i != l {
-				output += ", "
-			}
-		}
-		return output + "]"
+    return "[" + map { "\($0)" }.joined(separator: ",") + "]"
 	}
 
 	/**
@@ -105,15 +93,6 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 		return tree.last?.value
 	}
 
-	/**
-		:name:	isEmpty
-		:description:	A boolean of whether the RedBlackTree is empty.
-		- returns:	Bool
-	*/
-	public var isEmpty: Bool {
-		return 0 == count
-	}
-
 	/**
 		:name:	startIndex
 		:description:	Conforms to the Collection Protocol.
@@ -158,14 +137,9 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 	}
 
 	public func makeIterator() -> SortedSet.Iterator {
-        var index = startIndex
+        var i = indices.makeIterator()
         return AnyIterator {
-            if index < self.endIndex {
-                let i = index
-                index += 1
-                return self[i]
-            }
-            return nil
+            i.next().map { self[$0] }
         }
 	}
 
@@ -283,7 +257,7 @@ public struct SortedSet<T: Comparable>: Probable, Collection, Equatable, CustomS
 	*/
 	mutating public func insert(_ elements: [Element]) {
 		for x in elements {
-            tree.insert(value: x, for: x)
+      tree.insert(value: x, for: x)
 		}
 		count = tree.count
 	}
