replace singular statement ++/-- with += 1/-= 1 for integer variables

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -342,7 +342,7 @@ struct _RaceTestAggregatedEvaluations : CustomStringConvertible {
   mutating func addEvaluation(evaluation: RaceTestObservationEvaluation) {
     switch evaluation {
     case .Pass:
-      ++passCount
+      passCount += 1
 
     case .PassInteresting(let s):
       if passInterestingCount[s] == nil {
@@ -351,7 +351,7 @@ struct _RaceTestAggregatedEvaluations : CustomStringConvertible {
       passInterestingCount[s] = passInterestingCount[s]! + 1
 
     case .Failure:
-      ++failureCount
+      failureCount += 1
 
     case .FailureInteresting(let s):
       if failureInterestingCount[s] == nil {

stdlib/private/SwiftPrivate/IO.swift

@@ -49,7 +49,7 @@ public struct _FDInputStream {
       _buffer.reserveCapacity(minFree - bufferFree)
       while bufferFree < minFree {
         _buffer.append(0)
-        ++bufferFree
+        bufferFree += 1
       }
     }
     let readResult: __swift_ssize_t = _buffer.withUnsafeMutableBufferPointer {

stdlib/public/SDK/Foundation/Foundation.swift

@@ -696,7 +696,7 @@ final public class NSFastGenerator : GeneratorType {
       if count == 0 { return .None }
     }
     let next : AnyObject = state[0].itemsPtr[n]!
-    ++n
+    n += 1
     return next
   }
 

stdlib/public/SDK/Foundation/NSStringAPI.swift

@@ -54,7 +54,7 @@ func _countFormatSpecifiers(a: String) -> Int {
         lastChar = notPercentUTF16
       }
       else {
-        ++count
+        count += 1
         lastChar = c
       }
     } else {
@@ -141,7 +141,7 @@ extension String {
     var p = NSString.availableStringEncodings()
     while p.memory != 0 {
       result.append(p.memory)
-      ++p
+      p += 1
     }
     return result
   }

stdlib/public/core/ArrayBuffer.swift

@@ -225,7 +225,7 @@ extension _ArrayBuffer {
     var result = target
     for _ in subRange {
       result.initialize(result.memory)
-      ++result
+      result += 1
     }
     return result
   }

stdlib/public/core/ContiguousArrayBuffer.swift

@@ -663,7 +663,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
   mutating func addWithExistingCapacity(element: Element) {
     _sanityCheck(remainingCapacity > 0,
       "_UnsafePartiallyInitializedContiguousArrayBuffer has no more capacity")
-    remainingCapacity--
+    remainingCapacity -= 1
 
     (p++).initialize(element)
   }

stdlib/public/core/Reflection.swift

@@ -175,7 +175,7 @@ func _dumpWithMirror<TargetStream : OutputStreamType>(
     inout _ targetStream: TargetStream
 ) {
   if maxItemCounter <= 0 { return }
-  --maxItemCounter
+  maxItemCounter -= 1
 
   for _ in 0..<indent { print(" ", terminator: "", toStream: &targetStream) }
 

stdlib/public/core/Sequence.swift

@@ -240,7 +240,7 @@ internal class _DropFirstSequence<Base : GeneratorType>
         dropped = limit
         return nil
       }
-      ++dropped
+      dropped += 1
     }
     return generator.next()
   }
@@ -270,7 +270,7 @@ internal class _PrefixSequence<Base : GeneratorType> : SequenceType, GeneratorTy
 
   internal func next() -> Base.Element? {
     if taken >= maxLength { return nil }
-    ++taken
+    taken += 1
 
     if let next = generator.next() {
       return next

stdlib/public/core/StaticString.swift

@@ -119,7 +119,7 @@ public struct StaticString
       var i = 0
       let sink: (UInt8) -> Void = {
         buffer = buffer | (UInt64($0) << (UInt64(i) * 8))
-        ++i
+        i += 1
       }
       UTF8.encode(unicodeScalar, output: sink)
       return body(UnsafeBufferPointer(

stdlib/public/core/StringUnicodeScalarView.swift

@@ -77,7 +77,7 @@ extension String {
         let codeUnit = _core[--i]
         if _slowPath((codeUnit >> 10) == 0b1101_11) {
           if i != 0 && (_core[i - 1] >> 10) == 0b1101_10 {
-            --i
+            i -= 1
           }
         }
         return Index(i, _core)

stdlib/public/core/VarArgs.swift

@@ -398,9 +398,9 @@ final public class VaListBuilder {
            + (sseRegistersUsed * _x86_64SSERegisterWords)
       for w in encoded {
         storage[startIndex] = w
-        ++startIndex
+        startIndex += 1
       }
-      ++sseRegistersUsed
+      sseRegistersUsed += 1
     }
     else if encoded.count == 1 && gpRegistersUsed < _x86_64CountGPRegisters {
       storage[gpRegistersUsed++] = encoded[0]

test/1_stdlib/Dispatch.swift

@@ -32,7 +32,7 @@ DispatchAPI.test("OS_OBJECT support") {
 DispatchAPI.test("dispatch_block_t conversions") {
   var counter = 0
   let closure = { () -> Void in
-    counter++
+    counter += 1
   }
 
   let block = closure as dispatch_block_t
@@ -59,7 +59,7 @@ if #available(OSX 10.10, iOS 8.0, *) {
     var counter = 0
 
     let block = dispatch_block_create(dispatch_block_flags_t(0)) {
-      counter++
+      counter += 1
     }
     block()
     expectEqual(1, counter)

test/1_stdlib/ErrorHandling.swift

@@ -127,7 +127,7 @@ ErrorHandlingTests.test("ErrorHandling/forEach") {
   var loopCount = 0
   do {
     try [1, 2, 3].forEach {
-      ++loopCount
+      loopCount += 1
       if $0 == 2 {
         throw SillyError.JazzHands
       }
@@ -143,7 +143,7 @@ ErrorHandlingTests.test("ErrorHandling/Optional flatMap") {
   var loopCount = 0
   do {
     let _: [Int] = try [1, 2, 3].flatMap {
-      ++loopCount
+      loopCount += 1
       if $0 == 2 {
         throw SillyError.JazzHands
       }
@@ -159,7 +159,7 @@ ErrorHandlingTests.test("ErrorHandling/Array flatMap") {
   var loopCount = 0
   do {
     let _: [Int] = try [1, 2, 3].flatMap {(x) -> [Int] in
-      ++loopCount
+      loopCount += 1
       if x == 2 {
         throw SillyError.JazzHands
       }
@@ -235,7 +235,7 @@ ErrorHandlingTests.test("ErrorHandling/reduce") {
     let x: Int = try [1, 2, 3, 4, 5].reduce(0, combine: {
       (x: Int, y: Int) -> Int
     in
-      ++loopCount
+      loopCount += 1
       var total = x + y
       if total > 5 {
         throw SillyError.JazzHands
@@ -287,7 +287,7 @@ ErrorHandlingTests.test("ErrorHandling/Sequence map") {
         if loopCount == throwAtCount {
           throw SillyError.JazzHands
         }
-        ++loopCount
+        loopCount += 1
         return Noisy()
       }
       expectEqual(NoisyCount, initialCount + 3)
@@ -308,7 +308,7 @@ ErrorHandlingTests.test("ErrorHandling/Sequence filter") {
           if loopCount == throwAtCount {
             throw SillyError.JazzHands
           }
-          ++loopCount
+          loopCount += 1
           return condition
         }
         expectEqual(NoisyCount, initialCount + sequence.count)
@@ -329,7 +329,7 @@ ErrorHandlingTests.test("ErrorHandling/Collection map") {
         if loopCount == throwAtCount {
           throw SillyError.JazzHands
         }
-        ++loopCount
+        loopCount += 1
         return Noisy()
       }
       expectEqual(NoisyCount, initialCount + 3)

test/1_stdlib/Inputs/DictionaryKeyValueTypes.swift

@@ -428,15 +428,15 @@ struct TestBridgedValueTy : CustomStringConvertible, _ObjectiveCBridgeable {
   }
 
   func _bridgeToObjectiveC() -> TestObjCValueTy {
-    TestBridgedValueTy.bridgeOperations++
+    TestBridgedValueTy.bridgeOperations += 1
     return TestObjCValueTy(value)
   }
 
   static func _forceBridgeFromObjectiveC(
     x: TestObjCValueTy,
     inout result: TestBridgedValueTy?
   ) {
-    TestBridgedValueTy.bridgeOperations++
+    TestBridgedValueTy.bridgeOperations += 1
     result = TestBridgedValueTy(x.value)
   }
 
@@ -637,7 +637,7 @@ func slurpFastEnumerationFromSwift(
     for i in 0..<returnedCount {
       let value: AnyObject = state.itemsPtr[i]!
       sink(value)
-      ++itemsReturned
+      itemsReturned += 1
     }
     if maxItems != nil && itemsReturned >= maxItems! {
       return
@@ -681,7 +681,7 @@ func slurpFastEnumerationFromSwift(
       let value: AnyObject = d.objectForKey(key)!
       let kv = (key, value)
       sink(kv)
-      ++itemsReturned
+      itemsReturned += 1
     }
     if maxItems != nil && itemsReturned >= maxItems! {
       return
@@ -999,7 +999,7 @@ func slurpFastEnumerationFromSwift(
     for i in 0..<returnedCount {
       let value: AnyObject = state.itemsPtr[i]!
       sink(value)
-      ++itemsReturned
+      itemsReturned += 1
     }
     if maxItems != nil && itemsReturned >= maxItems! {
       return

test/1_stdlib/NSStringAPI.swift

@@ -202,7 +202,7 @@ NSStringAPIs.test("init(UTF8String:)") {
   var i = 0
   for b in s.utf8 {
     up[i] = b
-    i++
+    i += 1
   }
   up[i] = 0
   expectOptionalEqual(s, String(UTF8String: UnsafePointer(up)))

test/1_stdlib/Runtime.swift

@@ -17,10 +17,10 @@ import MirrorObjC
 var nsObjectCanaryCount = 0
 @objc class NSObjectCanary : NSObject {
   override init() {
-    ++nsObjectCanaryCount
+    nsObjectCanaryCount += 1
   }
   deinit {
-    --nsObjectCanaryCount
+    nsObjectCanaryCount -= 1
   }
 }
 
@@ -31,10 +31,10 @@ struct NSObjectCanaryStruct {
 var swiftObjectCanaryCount = 0
 class SwiftObjectCanary {
   init() {
-    ++swiftObjectCanaryCount
+    swiftObjectCanaryCount += 1
   }
   deinit {
-    --swiftObjectCanaryCount
+    swiftObjectCanaryCount -= 1
   }
 }
 
@@ -909,14 +909,14 @@ RuntimeFoundationWrappers.test("_stdlib_NSObject_isEqual/NoLeak") {
 var nsStringCanaryCount = 0
 @objc class NSStringCanary : NSString {
   override init() {
-    ++nsStringCanaryCount
+    nsStringCanaryCount += 1
     super.init()
   }
   required init(coder: NSCoder) {
     fatalError("don't call this initializer")
   }
   deinit {
-    --nsStringCanaryCount
+    nsStringCanaryCount -= 1
   }
   @objc override var length: Int {
     return 0
@@ -2266,7 +2266,7 @@ func computeCountLeadingZeroes(x: Int64) -> Int64 {
   var r: Int64 = 64
   while x != 0 {
     x >>= 1
-    r--
+    r -= 1
   }
   return r
 }

test/1_stdlib/StringReallocation.swift

@@ -15,7 +15,7 @@ func testReallocation() {
       story += " "
       story += s
       if lastBase != story._core._baseAddress {
-        ++reallocations
+        reallocations += 1
 
         // To avoid dumping a vast string here, just write the first
         // part of the story out each time there's a reallocation.

test/1_stdlib/Zip.swift

@@ -10,7 +10,7 @@ var i = 0
 var prefix = ""
 for p in zip(n, s) {
     print("\(prefix)\(p.0) => \(p.1)", terminator: "")
-    ++i
+    i += 1
     prefix = ", "
 }
 print(" (\(i) items)")
@@ -20,7 +20,7 @@ i = 0
 prefix = ""
 for p in zip(s, n) {
     print("\(prefix)\(p.0) => \(p.1)", terminator: "")
-    ++i
+    i += 1
     prefix = ", "
 }
 print(" (\(i) items)")

test/Constraints/nested_generics.swift

@@ -34,7 +34,7 @@ struct AnyStream<T : SequenceType> {
     func next() -> Element? {
       let result = (index, elements.next())
       if result.1 == nil { return .None }
-      ++index
+      index += 1
       return (result.0, result.1!)
     }
   }

test/DebugInfo/inout2.swift

@@ -26,13 +26,13 @@ struct Struct {
 func foo(inout x: Class) {
 // CHECK: !DILocalVariable(name: "x", arg: 1{{.*}} line: [[@LINE-1]]
   markUsed(x.ivar)
-  x.ivar++ // Set breakpoint here
+  x.ivar += 1 // Set breakpoint here
 }
 
 func foo(inout x: Struct) {
 // CHECK: !DILocalVariable(name: "x", arg: 1{{.*}} line: [[@LINE-1]]
   markUsed(x.ivar)
-  x.ivar++ // Set breakpoint here
+  x.ivar += 1 // Set breakpoint here
 }
 
 func main() {

test/Generics/algorithms.swift

@@ -41,7 +41,7 @@ func count<R : GeneratorType where R.Element : Eq>
   var result = 0
   for x in GeneratorSequence(range) {
     if x == value {
-      ++result
+      result += 1
     }
   }
   return result
@@ -53,7 +53,7 @@ func countIf<
   var result = 0
   for x in GeneratorSequence(range) {
     if predicate(x) {
-      ++result
+      result += 1
     }
   }
   return result