Merge pull request #154 from nRewik/master

parkera · parkera · commit ccadbf3e09fd · 2015-12-17T08:51:21.000-08:00
Remove ++ and -- operators
diff --git a/Foundation/NSArray.swift b/Foundation/NSArray.swift
@@ -710,7 +710,8 @@ public class NSMutableArray : NSArray {
 
         var objectIdx = 0
         indexes.enumerateIndexesUsingBlock() { (insertionIndex, _) in
-            self.insertObject(objects[objectIdx++], atIndex: insertionIndex)
+            self.insertObject(objects[objectIdx], atIndex: insertionIndex)
+            objectIdx += 1
         }
     }
     
diff --git a/Foundation/NSCFDictionary.swift b/Foundation/NSCFDictionary.swift
@@ -54,7 +54,9 @@ internal final class _NSCFDictionary : NSMutableDictionary {
             if index == count {
                 return nil
             } else {
-                return keyArray[index++]
+                let item = keyArray[index]
+                index += 1
+                return item
             }
         }
         
@@ -139,7 +141,7 @@ internal func _CFSwiftDictionaryGetKeysAndValues(dictionary: AnyObject, keybuf:
     (dictionary as! NSDictionary).enumerateKeysAndObjectsUsingBlock { key, value, _ in
         keybuf[idx] = Unmanaged<AnyObject>.passUnretained(key)
         valuebuf[idx] = Unmanaged<AnyObject>.passUnretained(value)
-        idx++
+        idx += 1
     }
 }
 
diff --git a/Foundation/NSCalendar.swift b/Foundation/NSCalendar.swift
@@ -411,7 +411,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {
     private func _setComp(unitFlags: NSCalendarUnit, field: NSCalendarUnit, vector: [Int32], inout compIndex: Int, setter: (Int32) -> Void) {
         if unitFlags.contains(field) {
             setter(vector[compIndex])
-            compIndex++
+            compIndex += 1
         }
     }
     
diff --git a/Foundation/NSDictionary.swift b/Foundation/NSDictionary.swift
@@ -22,7 +22,7 @@ extension Dictionary : _ObjectTypeBridgeable {
             let value = _NSObjectRepresentableBridge($0.1)
             keyBuffer.advancedBy(idx).initialize(key)
             valueBuffer.advancedBy(idx).initialize(value)
-            idx++
+            idx += 1
         }
         
         let dict = NSDictionary(objects: valueBuffer, forKeys: keyBuffer, count: count)
diff --git a/Foundation/NSIndexSet.swift b/Foundation/NSIndexSet.swift
@@ -160,7 +160,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding
                 guard idx < NSNotFound else {
                     return nil
                 }
-                result++
+                result += 1
             }
             
             if let rangeIndex = _indexOfRangeAfterOrContainingIndex(result) {
@@ -173,7 +173,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding
                 guard idx > 0 else {
                     return nil
                 }
-                result--
+                result -= 1
             }
             
             if let rangeIndex = _indexOfRangeBeforeOrContainingIndex(result) {
@@ -229,12 +229,13 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding
                 }
                 
                 while idx <= maxIndex && counter < bufferSize && offset < currentRange.length {
-                    indexBuffer.advancedBy(counter++).memory = idx
-                    ++idx
-                    ++offset
+                    indexBuffer.advancedBy(counter).memory = idx
+                    counter += 1
+                    idx += 1
+                    offset += 1
                 }
                 if offset >= currentRange.length {
-                    ++rangeIndex
+                    rangeIndex += 1
                     offset = 0
                 }
             }
@@ -266,7 +267,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding
                     return range.length
                 }
                 result = NSMaxRange(firstRange) - range.location
-                rangeIndex++
+                rangeIndex += 1
             }
             
             for curRange in _ranges.suffixFrom(rangeIndex) {
@@ -518,7 +519,7 @@ public class NSMutableIndexSet : NSIndexSet {
                 // overlaps
                 if curEnd < nextEnd {
                     self._replaceRangeAtIndex(rangeIndex, withRange: NSMakeRange(nextEnd - curRange.location, curRange.length))
-                    rangeIndex++
+                    rangeIndex += 1
                 }
                 self._replaceRangeAtIndex(rangeIndex + 1, withRange: nil)
             } else {
@@ -560,7 +561,7 @@ public class NSMutableIndexSet : NSIndexSet {
                 // Proceed to merging
                 break
             }
-            rangeIndex++
+            rangeIndex += 1
         }
         if let r = replacedRangeIndex {
             _mergeOverlappingRangesStartingAtIndex(r)
@@ -602,7 +603,7 @@ public class NSMutableIndexSet : NSIndexSet {
             } else if range.location > curRange.location && range.location < curEnd && removeEnd >= curEnd {
                 _replaceRangeAtIndex(rangeIndex, withRange: NSMakeRange(curRange.location, range.location - curRange.location))
             }
-            rangeIndex++
+            rangeIndex += 1
         }
         
     }
diff --git a/Foundation/NSPathUtilities.swift b/Foundation/NSPathUtilities.swift
@@ -87,14 +87,14 @@ internal extension String {
             
             while curPos < endPos {
                 while curPos < endPos && characterView[curPos] == "/" {
-                    curPos++
+                    curPos = curPos.successor()
                 }
                 if curPos == endPos {
                     break
                 }
                 var curEnd = curPos
                 while curEnd < endPos && characterView[curEnd] != "/" {
-                    curEnd++
+                    curEnd = curEnd.successor()
                 }
                 result.append(String(characterView[curPos ..< curEnd]))
                 curPos = curEnd
@@ -204,14 +204,14 @@ public extension NSString {
             
             while curPos < endPos {
                 while curPos < endPos && characterView[curPos] == "/" {
-                    curPos++
+                    curPos = curPos.successor()
                 }
                 if curPos == endPos {
                     break
                 }
                 var curEnd = curPos
                 while curEnd < endPos && characterView[curEnd] != "/" {
-                    curEnd++
+                    curEnd = curEnd.successor()
                 }
                 result.append(String(characterView[curPos ..< curEnd]))
                 curPos = curEnd
diff --git a/Foundation/NSScanner.swift b/Foundation/NSScanner.swift
@@ -143,7 +143,8 @@ internal struct _NSStringBuffer {
     
     mutating func advance() {
         if bufferLoc < bufferLen { /*buffer is OK*/
-            curChar = buffer[bufferLoc++]
+            curChar = buffer[bufferLoc]
+            bufferLoc += 1
         } else if (_stringLoc + bufferLen < stringLen) { /* Buffer is empty but can be filled */
             _stringLoc += bufferLen
             fill()
@@ -155,7 +156,7 @@ internal struct _NSStringBuffer {
     
     mutating func rewind() {
         if bufferLoc > 1 { /* Buffer is OK */
-            bufferLoc--
+            bufferLoc -= 1
             curChar = buffer[bufferLoc - 1]
         } else if _stringLoc > 0 { /* Buffer is empty but can be filled */
             bufferLoc = min(32, _stringLoc)
@@ -195,7 +196,8 @@ internal struct _NSStringBuffer {
                 fill()
             }
             bufferLoc = newValue - _stringLoc
-            curChar = buffer[bufferLoc++]
+            curChar = buffer[bufferLoc]
+            bufferLoc += 1
         }
     }
 }
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -753,7 +753,7 @@ extension NSString {
                 buf.rewind()
                 if buf.currentCharacter == 0x0d {
                     lineSeparatorLength = 2
-                    endOfContents--
+                    endOfContents -= 1
                 }
             } else {
                 while true {
@@ -938,15 +938,21 @@ extension NSString {
                 let cfEncodings = CFStringGetListOfAvailableEncodings()
                 var idx = 0
                 var numEncodings = 0
-                while cfEncodings.advancedBy(idx++).memory != kCFStringEncodingInvalidId {
-                    numEncodings++
+                
+                while cfEncodings.advancedBy(idx).memory != kCFStringEncodingInvalidId {
+                    idx += 1
+                    numEncodings += 1
                 }
                 
                 let theEncodingList = UnsafeMutablePointer<NSStringEncoding>.alloc(numEncodings + 1)
                 theEncodingList.advancedBy(numEncodings).memory = 0 // Terminator
-                while --numEncodings >= 0 {
+                
+                numEncodings -= 1
+                while numEncodings >= 0 {
                     theEncodingList.advancedBy(numEncodings).memory = CFStringConvertEncodingToNSStringEncoding(cfEncodings.advancedBy(numEncodings).memory)
+                    numEncodings -= 1
                 }
+                
                 return UnsafePointer<UInt>(theEncodingList)
             }()
         }
@@ -1399,7 +1405,7 @@ extension String {
         var encodingArray = Array<NSStringEncoding>()
         while encodings.advancedBy(numEncodings).memory != CoreFoundation.kCFStringEncodingInvalidId {
             encodingArray.append(CFStringConvertEncodingToNSStringEncoding(encodings.advancedBy(numEncodings).memory))
-            numEncodings++
+            numEncodings += 1
         }
         return encodingArray
     }

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,8 @@ public class NSMutableArray : NSArray {`
`710`	`710`
`711`	`711`	`var objectIdx = 0`
`712`	`712`	`indexes.enumerateIndexesUsingBlock() { (insertionIndex, _) in`
`713`		`- self.insertObject(objects[objectIdx++], atIndex: insertionIndex)`
	`713`	`+ self.insertObject(objects[objectIdx], atIndex: insertionIndex)`
	`714`	`+ objectIdx += 1`
`714`	`715`	`}`
`715`	`716`	`}`
`716`	`717`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,9 @@ internal final class _NSCFDictionary : NSMutableDictionary {`
`54`	`54`	`if index == count {`
`55`	`55`	`return nil`
`56`	`56`	`} else {`
`57`		`- return keyArray[index++]`
	`57`	`+ let item = keyArray[index]`
	`58`	`+ index += 1`
	`59`	`+ return item`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`
`@@ -139,7 +141,7 @@ internal func _CFSwiftDictionaryGetKeysAndValues(dictionary: AnyObject, keybuf:`
`139`	`141`	`(dictionary as! NSDictionary).enumerateKeysAndObjectsUsingBlock { key, value, _ in`
`140`	`142`	`keybuf[idx] = Unmanaged<AnyObject>.passUnretained(key)`
`141`	`143`	`valuebuf[idx] = Unmanaged<AnyObject>.passUnretained(value)`
`142`		`- idx++`
	`144`	`+ idx += 1`
`143`	`145`	`}`
`144`	`146`	`}`
`145`	`147`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ public class NSCalendar : NSObject, NSCopying, NSSecureCoding {`
`411`	`411`	`private func _setComp(unitFlags: NSCalendarUnit, field: NSCalendarUnit, vector: [Int32], inout compIndex: Int, setter: (Int32) -> Void) {`
`412`	`412`	`if unitFlags.contains(field) {`
`413`	`413`	`setter(vector[compIndex])`
`414`		`- compIndex++`
	`414`	`+ compIndex += 1`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extension Dictionary : _ObjectTypeBridgeable {`
`22`	`22`	`let value = _NSObjectRepresentableBridge($0.1)`
`23`	`23`	`keyBuffer.advancedBy(idx).initialize(key)`
`24`	`24`	`valueBuffer.advancedBy(idx).initialize(value)`
`25`		`- idx++`
	`25`	`+ idx += 1`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`let dict = NSDictionary(objects: valueBuffer, forKeys: keyBuffer, count: count)`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding`
`160`	`160`	`guard idx < NSNotFound else {`
`161`	`161`	`return nil`
`162`	`162`	`}`
`163`		`- result++`
	`163`	`+ result += 1`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if let rangeIndex = _indexOfRangeAfterOrContainingIndex(result) {`
`@@ -173,7 +173,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding`
`173`	`173`	`guard idx > 0 else {`
`174`	`174`	`return nil`
`175`	`175`	`}`
`176`		`- result--`
	`176`	`+ result -= 1`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if let rangeIndex = _indexOfRangeBeforeOrContainingIndex(result) {`
`@@ -229,12 +229,13 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`while idx <= maxIndex && counter < bufferSize && offset < currentRange.length {`
`232`		`- indexBuffer.advancedBy(counter++).memory = idx`
`233`		`- ++idx`
`234`		`- ++offset`
	`232`	`+ indexBuffer.advancedBy(counter).memory = idx`
	`233`	`+ counter += 1`
	`234`	`+ idx += 1`
	`235`	`+ offset += 1`
`235`	`236`	`}`
`236`	`237`	`if offset >= currentRange.length {`
`237`		`- ++rangeIndex`
	`238`	`+ rangeIndex += 1`
`238`	`239`	`offset = 0`
`239`	`240`	`}`
`240`	`241`	`}`
`@@ -266,7 +267,7 @@ public class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding`
`266`	`267`	`return range.length`
`267`	`268`	`}`
`268`	`269`	`result = NSMaxRange(firstRange) - range.location`
`269`		`- rangeIndex++`
	`270`	`+ rangeIndex += 1`
`270`	`271`	`}`
`271`	`272`
`272`	`273`	`for curRange in _ranges.suffixFrom(rangeIndex) {`
`@@ -518,7 +519,7 @@ public class NSMutableIndexSet : NSIndexSet {`
`518`	`519`	`// overlaps`
`519`	`520`	`if curEnd < nextEnd {`
`520`	`521`	`self._replaceRangeAtIndex(rangeIndex, withRange: NSMakeRange(nextEnd - curRange.location, curRange.length))`
`521`		`- rangeIndex++`
	`522`	`+ rangeIndex += 1`
`522`	`523`	`}`
`523`	`524`	`self._replaceRangeAtIndex(rangeIndex + 1, withRange: nil)`
`524`	`525`	`} else {`
`@@ -560,7 +561,7 @@ public class NSMutableIndexSet : NSIndexSet {`
`560`	`561`	`// Proceed to merging`
`561`	`562`	`break`
`562`	`563`	`}`
`563`		`- rangeIndex++`
	`564`	`+ rangeIndex += 1`
`564`	`565`	`}`
`565`	`566`	`if let r = replacedRangeIndex {`
`566`	`567`	`_mergeOverlappingRangesStartingAtIndex(r)`
`@@ -602,7 +603,7 @@ public class NSMutableIndexSet : NSIndexSet {`
`602`	`603`	`} else if range.location > curRange.location && range.location < curEnd && removeEnd >= curEnd {`
`603`	`604`	`_replaceRangeAtIndex(rangeIndex, withRange: NSMakeRange(curRange.location, range.location - curRange.location))`
`604`	`605`	`}`
`605`		`- rangeIndex++`
	`606`	`+ rangeIndex += 1`
`606`	`607`	`}`
`607`	`608`
`608`	`609`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,14 @@ internal extension String {`
`87`	`87`
`88`	`88`	`while curPos < endPos {`
`89`	`89`	`while curPos < endPos && characterView[curPos] == "/" {`
`90`		`- curPos++`
	`90`	`+ curPos = curPos.successor()`
`91`	`91`	`}`
`92`	`92`	`if curPos == endPos {`
`93`	`93`	`break`
`94`	`94`	`}`
`95`	`95`	`var curEnd = curPos`
`96`	`96`	`while curEnd < endPos && characterView[curEnd] != "/" {`
`97`		`- curEnd++`
	`97`	`+ curEnd = curEnd.successor()`
`98`	`98`	`}`
`99`	`99`	`result.append(String(characterView[curPos ..< curEnd]))`
`100`	`100`	`curPos = curEnd`
`@@ -204,14 +204,14 @@ public extension NSString {`
`204`	`204`
`205`	`205`	`while curPos < endPos {`
`206`	`206`	`while curPos < endPos && characterView[curPos] == "/" {`
`207`		`- curPos++`
	`207`	`+ curPos = curPos.successor()`
`208`	`208`	`}`
`209`	`209`	`if curPos == endPos {`
`210`	`210`	`break`
`211`	`211`	`}`
`212`	`212`	`var curEnd = curPos`
`213`	`213`	`while curEnd < endPos && characterView[curEnd] != "/" {`
`214`		`- curEnd++`
	`214`	`+ curEnd = curEnd.successor()`
`215`	`215`	`}`
`216`	`216`	`result.append(String(characterView[curPos ..< curEnd]))`
`217`	`217`	`curPos = curEnd`