removed c-style looping and operations

Daniel Dahan · Daniel Dahan · commit 11f4c1fa72f5 · 2016-04-01T16:55:54.000-04:00
diff --git a/Algorithm.podspec b/Algorithm.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'Algorithm'
-    s.version = '1.0.6'
+    s.version = '1.0.7'
     s.license = 'BSD'
     s.summary = 'A toolset for writing algorithms in Swift.'
     s.homepage = 'http://cosmicmind.io'
diff --git a/Sources/Algorithm+Array.swift b/Sources/Algorithm+Array.swift
@@ -63,7 +63,7 @@ extension Array : ProbableType {
 		for v in elements {
 			for x in self {
 				if v == x as! Element {
-					++c
+					c += 1
 				}
 			}
 		}
@@ -95,7 +95,7 @@ extension Array : ProbableType {
 		var c: Int = 0
 		for x in self {
 			if block(element: x) {
-				++c
+				c += 1
 			}
 		}
 		return Double(c) / Double(count)
diff --git a/Sources/Algorithm+Set.swift b/Sources/Algorithm+Set.swift
@@ -44,7 +44,7 @@ extension Set : ProbableType {
 		for v in elements {
 			for x in self {
 				if v == x as! Element {
-					++c
+					c += 1
 				}
 			}
 		}
@@ -76,7 +76,7 @@ extension Set : ProbableType {
 		var c: Int = 0
 		for x in self {
 			if block(element: x) {
-				++c
+				c += 1
 			}
 		}
 		return Double(c) / Double(count)
diff --git a/Sources/DoublyLinkedList.swift b/Sources/DoublyLinkedList.swift
@@ -71,7 +71,8 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 		var x: DoublyLinkedListNode<Element>? = head
 		while nil !== x {
 			output += "\(x)"
-			if ++c != count {
+			c += 1
+			if c != count {
 				output += ", "
 			}
 			x = x!.next
@@ -187,7 +188,7 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 	//
 	public func generate() -> DoublyLinkedList.Generator {
 		cursorToFront()
-		return anyGenerator {
+		return AnyGenerator {
 			if !self.isCursorAtBack {
 				let element: Element? = self.cursor
 				self.next
@@ -222,7 +223,8 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			head!.previous = z
 		}
 		head = z
-		if 1 == ++count {
+		count += 1
+		if 1 == count {
 			current = head
 		} else if head === current {
 			current = head!.next
@@ -240,7 +242,8 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			return nil
 		}
 		let element: Element? = head!.element
-		if 0 == --count {
+		count -= 1
+		if 0 == count {
 			reset()
 		} else {
 			head = head!.next
@@ -263,7 +266,8 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			tail!.next = z
 		}
 		tail = z
-		if 1 == ++count {
+		count += 1
+		if 1 == count {
 			current = tail
 		} else if tail === current {
 			current = tail!.previous
@@ -281,7 +285,8 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			return nil
 		}
 		let element: Element? = tail!.element
-		if 0 == --count {
+		count -= 1
+		if 0 == count {
 			reset()
 		} else {
 			tail = tail!.previous
@@ -316,7 +321,7 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			let z: DoublyLinkedListNode<Element> = DoublyLinkedListNode<Element>(next: current, previous: current!.previous,  element: element)
 			current!.previous?.next = z
 			current!.previous = z
-			++count
+			count += 1
 		}
 	}
 
@@ -331,7 +336,7 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			let z: DoublyLinkedListNode<Element> = DoublyLinkedListNode<Element>(next: current!.next, previous: current,  element: element)
 			current!.next?.previous = z
 			current!.next = z
-			++count
+			count += 1
 		}
 	}
 
@@ -356,7 +361,7 @@ public class DoublyLinkedList<Element> : CustomStringConvertible, SequenceType {
 			} else {
 				current = current!.next
 			}
-			--count
+			count -= 1
 			return element
 		}
 	}
diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Sources/RedBlackTree.swift b/Sources/RedBlackTree.swift
@@ -168,9 +168,11 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 	//
 	public func generate() -> RedBlackTree.Generator {
 		var index = startIndex
-		return anyGenerator {
+		return AnyGenerator {
 			if index < self.endIndex {
-				return self[index++]
+				let i: Int = index
+				index += 1
+				return self[i]
 			}
 			return nil
 		}
@@ -219,7 +221,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		var c: Int = 0
 		for (k, v) in self {
 			if block(key: k, value: v) {
-				++c
+				c += 1
 			}
 		}
 		return Double(c) / Double(count)
@@ -398,7 +400,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 
 		while x !== sentinel {
 			y = x
-			++y.order
+			y.order += 1
 			x = key < x.key ? x.left : x.right
 		}
 
@@ -413,7 +415,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		}
 
 		insertCleanUp(z)
-		++count
+		count += 1
 		return z
 	}
 
@@ -422,7 +424,8 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		:description:	The clean up procedure needed to maintain the RedBlackTree balance.
 		- returns:	RedBlackNode<Key, Value>
 	*/
-	private func insertCleanUp(var z: RedBlackNode<Key, Value>) {
+	private func insertCleanUp(node: RedBlackNode<Key, Value>) {
+		var z: RedBlackNode<Key, Value> = node
 		while z.parent.isRed {
 			if z.parent === z.parent.parent.left {
 				let y: RedBlackNode<Key, Value> = z.parent.parent.right
@@ -483,10 +486,10 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		if z !== root {
 			var t: RedBlackNode<Key, Value> = z.parent
 			while t !== root {
-				--t.order
+				t.order -= 1
 				t = t.parent
 			}
-			--root.order
+			root.order -= 1
 		}
 
 
@@ -512,7 +515,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 				y.right.parent = y
 				var t: RedBlackNode<Key, Value> = x.parent
 				while t !== y {
-					--t.order
+					t.order -= 1
 					t = t.parent
 				}
 				y.order = y.left.order + 1
@@ -526,7 +529,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		if !isRed {
 			removeCleanUp(x)
 		}
-		--count
+		count -= 1
 		return z
 	}
 
@@ -535,7 +538,8 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		:description:	After a successful removal of a node, the RedBlackTree
 		is rebalanced by this method.
 	*/
-	private func removeCleanUp(var x: RedBlackNode<Key, Value>) {
+	private func removeCleanUp(node: RedBlackNode<Key, Value>) {
+		var x: RedBlackNode<Key, Value> = node
 		while x !== root && !x.isRed {
 			if x === x.parent.left {
 				var y: RedBlackNode<Key, Value> = x.parent.right
@@ -595,7 +599,8 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		:description:	Finds the minimum keyed node.
 		- returns:	RedBlackNode<Key, Value>
 	*/
-	private func minimum(var x: RedBlackNode<Key, Value>) -> RedBlackNode<Key, Value> {
+	private func minimum(node: RedBlackNode<Key, Value>) -> RedBlackNode<Key, Value> {
+		var x: RedBlackNode<Key, Value> = node
 		var y: RedBlackNode<Key, Value> = sentinel
 		while x !== sentinel {
 			y = x
@@ -716,7 +721,7 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 	private func internalCount(key: Key, node: RedBlackNode<Key, Value>, inout count: Int) {
 		if sentinel !== node {
 			if key == node.key {
-				++count
+				count += 1
 			}
 			internalCount(key, node: node.left, count: &count)
 			internalCount(key, node: node.right, count: &count)
@@ -742,7 +747,8 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 		:description:	Traverses the Tree for the internal order statistic of a key.
 		- returns:	Int
 	*/
-	private func internalOrder(var x: RedBlackNode<Key, Value>) -> Int {
+	private func internalOrder(node: RedBlackNode<Key, Value>) -> Int {
+		var x: RedBlackNode<Key, Value> = node
 		var r: Int = x.left.order + 1
 		while root !== x {
 			if x.parent.right === x {
diff --git a/Sources/SortedDictionary.swift b/Sources/SortedDictionary.swift
@@ -174,9 +174,11 @@ public class SortedDictionary<Key : Comparable, Value where Key : Hashable> : Pr
 	//
 	public func generate() -> SortedDictionary.Generator {
 		var index = startIndex
-		return anyGenerator {
+		return AnyGenerator {
 			if index < self.endIndex {
-				return self[index++]
+				let i: Int = index
+				index += 1
+				return self[i]
 			}
 			return nil
 		}
diff --git a/Sources/SortedMultiDictionary.swift b/Sources/SortedMultiDictionary.swift
@@ -172,9 +172,11 @@ public class SortedMultiDictionary<Key : Comparable, Value where Key : Hashable>
 	//
 	public func generate() -> SortedMultiDictionary.Generator {
 		var index = startIndex
-		return anyGenerator {
+		return AnyGenerator {
 			if index < self.endIndex {
-				return self[index++]
+				let i: Int = index
+				index += 1
+				return self[i]
 			}
 			return nil
 		}
diff --git a/Sources/SortedMultiSet.swift b/Sources/SortedMultiSet.swift
diff --git a/Sources/SortedSet.swift b/Sources/SortedSet.swift
diff --git a/Tests/SortedDictionaryTests.swift b/Tests/SortedDictionaryTests.swift
diff --git a/Tests/SortedMultiDictionaryTests.swift b/Tests/SortedMultiDictionaryTests.swift

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ extension Array : ProbableType {`
`63`	`63`	`for v in elements {`
`64`	`64`	`for x in self {`
`65`	`65`	`if v == x as! Element {`
`66`		`- ++c`
	`66`	`+ c += 1`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -95,7 +95,7 @@ extension Array : ProbableType {`
`95`	`95`	`var c: Int = 0`
`96`	`96`	`for x in self {`
`97`	`97`	`if block(element: x) {`
`98`		`- ++c`
	`98`	`+ c += 1`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`return Double(c) / Double(count)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ extension Set : ProbableType {`
`44`	`44`	`for v in elements {`
`45`	`45`	`for x in self {`
`46`	`46`	`if v == x as! Element {`
`47`		`- ++c`
	`47`	`+ c += 1`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -76,7 +76,7 @@ extension Set : ProbableType {`
`76`	`76`	`var c: Int = 0`
`77`	`77`	`for x in self {`
`78`	`78`	`if block(element: x) {`
`79`		`- ++c`
	`79`	`+ c += 1`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`return Double(c) / Double(count)`
Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,11 @@ public class SortedDictionary<Key : Comparable, Value where Key : Hashable> : Pr`
`174`	`174`	`//`
`175`	`175`	`public func generate() -> SortedDictionary.Generator {`
`176`	`176`	`var index = startIndex`
`177`		`- return anyGenerator {`
	`177`	`+ return AnyGenerator {`
`178`	`178`	`if index < self.endIndex {`
`179`		`- return self[index++]`
	`179`	`+ let i: Int = index`
	`180`	`+ index += 1`
	`181`	`+ return self[i]`
`180`	`182`	`}`
`181`	`183`	`return nil`
`182`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,11 @@ public class SortedMultiDictionary<Key : Comparable, Value where Key : Hashable>`
`172`	`172`	`//`
`173`	`173`	`public func generate() -> SortedMultiDictionary.Generator {`
`174`	`174`	`var index = startIndex`
`175`		`- return anyGenerator {`
	`175`	`+ return AnyGenerator {`
`176`	`176`	`if index < self.endIndex {`
`177`		`- return self[index++]`
	`177`	`+ let i: Int = index`
	`178`	`+ index += 1`
	`179`	`+ return self[i]`
`178`	`180`	`}`
`179`	`181`	`return nil`
`180`	`182`	`}`