Merge pull request #48 from ReactKit/remove-plusplus

inamiy · inamiy · commit 11b10eebf9ce · 2016-03-22T09:08:35.000+09:00
Replace `x++` to `x += 1` (for Swift 2.2)
diff --git a/Sources/StateMachine.swift b/Sources/StateMachine.swift
@@ -413,7 +413,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
 
                 if _canPassCondition(route.condition, forEvent: nil, fromState: context.fromState, toState: context.toState, userInfo: context.userInfo) {
                     if !shouldStop {
-                        chainingCount++
+                        chainingCount += 1
 
                         shouldIncrementChainingCount = false
                     }
@@ -428,7 +428,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
             shouldIncrementChainingCount = true
 
             if !shouldStop {
-                allCount++
+                allCount += 1
             }
 
             if chainingCount < allCount {
diff --git a/Tests/MachineTests.swift b/Tests/MachineTests.swift
@@ -229,7 +229,7 @@ class MachineTests: _TestCase
                 .State0 => .State1,
                 .State1 => .State2,
             ], handler: { context in
-                invokeCount++
+                invokeCount += 1
                 return
             })
         }
@@ -258,7 +258,7 @@ class MachineTests: _TestCase
             ])
 
             machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -285,7 +285,7 @@ class MachineTests: _TestCase
                 .State0 => .State1,
                 .State1 => .State2,
             ], handler: { context in
-                invokeCount++
+                invokeCount += 1
                 return
             })
 
@@ -318,7 +318,7 @@ class MachineTests: _TestCase
             ])
 
             machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -342,7 +342,7 @@ class MachineTests: _TestCase
         let machine = Machine<MyState, MyEvent>(state: .State0) { machine in
             machine.addRoutes(event: .Event0, transitions: [ .State0 => .State1 ])
             machine.addErrorHandler { event, fromState, toState, userInfo in
-                invokeCount++
+                invokeCount += 1
             }
         }
 
@@ -368,7 +368,7 @@ class MachineTests: _TestCase
             ])
 
             let handlerDisposable = machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -415,7 +415,7 @@ class MachineTests: _TestCase
             }
 
             machine.addHandler(event: .Str("gogogo")) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -475,7 +475,7 @@ class MachineTests: _TestCase
                         return nil
                 }
             }, handler: { context in
-                invokeCount1++
+                invokeCount1 += 1
             })
 
             disposables += [d]
@@ -491,7 +491,7 @@ class MachineTests: _TestCase
                         return nil
                 }
             }, handler: { context in
-                invokeCount2++
+                invokeCount2 += 1
             })
 
             disposables += [d2]
diff --git a/Tests/RouteChainTests.swift b/Tests/RouteChainTests.swift
@@ -19,7 +19,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2
             machine.addRouteChain(.State0 => .State1 => .State2) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -53,7 +53,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2
             machine.addRouteChain(.State0 => .State1 => .State2, condition: { _ in flag }) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -121,7 +121,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2
             machine.addRouteChain(.State0 => .State1 => .State2) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
             // machine.addRoute(.State1 => .State3)    // comment-out: 1 => 3 is not possible
@@ -144,7 +144,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2 => 0 (back home) => 2
             machine.addRouteChain(.State0 => .State1 => .State2 => .State0 => .State2) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -170,7 +170,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2 => 0 (back home) => 1 => 2
             machine.addRouteChain(.State0 => .State1 => .State2 => .State0 => .State1 => .State2) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -207,7 +207,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2
             let chainDisposable = machine.addRouteChain(.State0 => .State1 => .State2) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -243,7 +243,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2 chainErrorHandler
             machine.addChainErrorHandler(transitionChain) { context in
-                errorCount++
+                errorCount += 1
                 return
             }
 
@@ -272,7 +272,7 @@ class MachineChainTests: _TestCase
 
             // add 0 => 1 => 2 chainErrorHandler
             let chainErrorHandlerDisposable = machine.addChainErrorHandler(transitionChain) { context in
-                errorCount++
+                errorCount += 1
                 return
             }
 
diff --git a/Tests/RouteMappingTests.swift b/Tests/RouteMappingTests.swift
@@ -99,7 +99,7 @@ class RouteMappingTests: _TestCase
 
             // increment `count` when any events i.e. `.CancelAction` and `.LoadAction(x)` succeed.
             machine.addHandler(event: .Any) { event, transition, order, userInfo in
-                count++
+                count += 1
             }
 
         }
@@ -154,7 +154,7 @@ class RouteMappingTests: _TestCase
 
             // increment `count` when any events i.e. `.CancelAction` and `.LoadAction(x)` succeed.
             machine.addHandler(.Any => .Any) { event, transition, order, userInfo in
-                count++
+                count += 1
             }
 
         }
diff --git a/Tests/StateMachineEventTests.swift b/Tests/StateMachineEventTests.swift
@@ -95,7 +95,7 @@ class StateMachineEventTests: _TestCase
         let machine = StateMachine<MyState, MyEvent>(state: .State0) { machine in
             machine.addRoute(.State0 => .State1)
             machine.addRoutes(event: .Event0, transitions: [.Any => .Any]) { _ in
-                eventCount++
+                eventCount += 1
             }
         }
 
@@ -260,7 +260,7 @@ class StateMachineEventTests: _TestCase
                 .State0 => .State1,
                 .State1 => .State2,
             ], handler: { context in
-                invokeCount++
+                invokeCount += 1
                 return
             })
         }
@@ -289,7 +289,7 @@ class StateMachineEventTests: _TestCase
             ])
 
             machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -325,7 +325,7 @@ class StateMachineEventTests: _TestCase
             ])
 
             machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -355,7 +355,7 @@ class StateMachineEventTests: _TestCase
             ])
 
             let handlerDisposable = machine.addHandler(event: .Event0) { context in
-                invokeCount++
+                invokeCount += 1
                 return
             }
 
@@ -399,27 +399,27 @@ class StateMachineEventTests: _TestCase
             //
 
             machine.addAnyHandler(.State0 => .State1) { context in
-                invokeCounts[0]++
+                invokeCounts[0] += 1
             }
 
             machine.addAnyHandler(.State1 => .State2) { context in
-                invokeCounts[1]++
+                invokeCounts[1] += 1
             }
 
             machine.addAnyHandler(.State2 => .State3) { context in
-                invokeCounts[2]++
+                invokeCounts[2] += 1
             }
 
             machine.addAnyHandler(.Any => .State3) { context in
-                invokeCounts[3]++
+                invokeCounts[3] += 1
             }
 
             machine.addAnyHandler(.State0 => .Any) { context in
-                invokeCounts[4]++
+                invokeCounts[4] += 1
             }
 
             machine.addAnyHandler(.Any => .Any) { context in
-                invokeCounts[5]++
+                invokeCounts[5] += 1
             }
 
         }
diff --git a/Tests/StateMachineTests.swift b/Tests/StateMachineTests.swift
@@ -176,7 +176,7 @@ class StateMachineTests: _TestCase
                 XCTAssertEqual(context.fromState, MyState.State0)
                 XCTAssertEqual(context.toState, MyState.State1)
 
-                invokedCount++
+                invokedCount += 1
             }
 
         }
@@ -205,7 +205,7 @@ class StateMachineTests: _TestCase
                 XCTAssertEqual(context.fromState, MyState.State0)
                 XCTAssertEqual(context.toState, MyState.State1)
 
-                invokedCount++
+                invokedCount += 1
             }
 
             // add 1 => 0 for resetting state
@@ -340,7 +340,7 @@ class StateMachineTests: _TestCase
                 XCTAssertEqual(context.fromState, MyState.State0)
                 XCTAssertEqual(context.toState, MyState.State1)
 
-                invokedCount++
+                invokedCount += 1
             }
 
         }
@@ -370,7 +370,7 @@ class StateMachineTests: _TestCase
                 XCTAssertEqual(context.fromState, MyState.State0)
                 XCTAssertEqual(context.toState, MyState.State1)
 
-                invokedCount++
+                invokedCount += 1
             }
 
             // order = 99
@@ -380,7 +380,7 @@ class StateMachineTests: _TestCase
                 XCTAssertEqual(context.fromState, MyState.State0)
                 XCTAssertEqual(context.toState, MyState.State1)
 
-                invokedCount++
+                invokedCount += 1
             }
 
         }
@@ -700,7 +700,7 @@ class StateMachineTests: _TestCase
                 }
 
             }, handler: { context in
-                invokedCount++
+                invokedCount += 1
             })
 
         }

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>`
`413`	`413`
`414`	`414`	`if _canPassCondition(route.condition, forEvent: nil, fromState: context.fromState, toState: context.toState, userInfo: context.userInfo) {`
`415`	`415`	`if !shouldStop {`
`416`		`- chainingCount++`
	`416`	`+ chainingCount += 1`
`417`	`417`
`418`	`418`	`shouldIncrementChainingCount = false`
`419`	`419`	`}`
`@@ -428,7 +428,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>`
`428`	`428`	`shouldIncrementChainingCount = true`
`429`	`429`
`430`	`430`	`if !shouldStop {`
`431`		`- allCount++`
	`431`	`+ allCount += 1`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`if chainingCount < allCount {`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class RouteMappingTests: _TestCase`
`99`	`99`
`100`	`100`	// increment `count` when any events i.e. `.CancelAction` and `.LoadAction(x)` succeed.
`101`	`101`	`machine.addHandler(event: .Any) { event, transition, order, userInfo in`
`102`		`- count++`
	`102`	`+ count += 1`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`}`
`@@ -154,7 +154,7 @@ class RouteMappingTests: _TestCase`
`154`	`154`
`155`	`155`	// increment `count` when any events i.e. `.CancelAction` and `.LoadAction(x)` succeed.
`156`	`156`	`machine.addHandler(.Any => .Any) { event, transition, order, userInfo in`
`157`		`- count++`
	`157`	`+ count += 1`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class StateMachineEventTests: _TestCase`
`95`	`95`	`let machine = StateMachine<MyState, MyEvent>(state: .State0) { machine in`
`96`	`96`	`machine.addRoute(.State0 => .State1)`
`97`	`97`	`machine.addRoutes(event: .Event0, transitions: [.Any => .Any]) { _ in`
`98`		`- eventCount++`
	`98`	`+ eventCount += 1`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`@@ -260,7 +260,7 @@ class StateMachineEventTests: _TestCase`
`260`	`260`	`.State0 => .State1,`
`261`	`261`	`.State1 => .State2,`
`262`	`262`	`], handler: { context in`
`263`		`- invokeCount++`
	`263`	`+ invokeCount += 1`
`264`	`264`	`return`
`265`	`265`	`})`
`266`	`266`	`}`
`@@ -289,7 +289,7 @@ class StateMachineEventTests: _TestCase`
`289`	`289`	`])`
`290`	`290`
`291`	`291`	`machine.addHandler(event: .Event0) { context in`
`292`		`- invokeCount++`
	`292`	`+ invokeCount += 1`
`293`	`293`	`return`
`294`	`294`	`}`
`295`	`295`
`@@ -325,7 +325,7 @@ class StateMachineEventTests: _TestCase`
`325`	`325`	`])`
`326`	`326`
`327`	`327`	`machine.addHandler(event: .Event0) { context in`
`328`		`- invokeCount++`
	`328`	`+ invokeCount += 1`
`329`	`329`	`return`
`330`	`330`	`}`
`331`	`331`
`@@ -355,7 +355,7 @@ class StateMachineEventTests: _TestCase`
`355`	`355`	`])`
`356`	`356`
`357`	`357`	`let handlerDisposable = machine.addHandler(event: .Event0) { context in`
`358`		`- invokeCount++`
	`358`	`+ invokeCount += 1`
`359`	`359`	`return`
`360`	`360`	`}`
`361`	`361`
`@@ -399,27 +399,27 @@ class StateMachineEventTests: _TestCase`
`399`	`399`	`//`
`400`	`400`
`401`	`401`	`machine.addAnyHandler(.State0 => .State1) { context in`
`402`		`- invokeCounts[0]++`
	`402`	`+ invokeCounts[0] += 1`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`machine.addAnyHandler(.State1 => .State2) { context in`
`406`		`- invokeCounts[1]++`
	`406`	`+ invokeCounts[1] += 1`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`machine.addAnyHandler(.State2 => .State3) { context in`
`410`		`- invokeCounts[2]++`
	`410`	`+ invokeCounts[2] += 1`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`machine.addAnyHandler(.Any => .State3) { context in`
`414`		`- invokeCounts[3]++`
	`414`	`+ invokeCounts[3] += 1`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`machine.addAnyHandler(.State0 => .Any) { context in`
`418`		`- invokeCounts[4]++`
	`418`	`+ invokeCounts[4] += 1`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`machine.addAnyHandler(.Any => .Any) { context in`
`422`		`- invokeCounts[5]++`
	`422`	`+ invokeCounts[5] += 1`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ class StateMachineTests: _TestCase`
`176`	`176`	`XCTAssertEqual(context.fromState, MyState.State0)`
`177`	`177`	`XCTAssertEqual(context.toState, MyState.State1)`
`178`	`178`
`179`		`- invokedCount++`
	`179`	`+ invokedCount += 1`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`}`
`@@ -205,7 +205,7 @@ class StateMachineTests: _TestCase`
`205`	`205`	`XCTAssertEqual(context.fromState, MyState.State0)`
`206`	`206`	`XCTAssertEqual(context.toState, MyState.State1)`
`207`	`207`
`208`		`- invokedCount++`
	`208`	`+ invokedCount += 1`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// add 1 => 0 for resetting state`
`@@ -340,7 +340,7 @@ class StateMachineTests: _TestCase`
`340`	`340`	`XCTAssertEqual(context.fromState, MyState.State0)`
`341`	`341`	`XCTAssertEqual(context.toState, MyState.State1)`
`342`	`342`
`343`		`- invokedCount++`
	`343`	`+ invokedCount += 1`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`}`
`@@ -370,7 +370,7 @@ class StateMachineTests: _TestCase`
`370`	`370`	`XCTAssertEqual(context.fromState, MyState.State0)`
`371`	`371`	`XCTAssertEqual(context.toState, MyState.State1)`
`372`	`372`
`373`		`- invokedCount++`
	`373`	`+ invokedCount += 1`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`// order = 99`
`@@ -380,7 +380,7 @@ class StateMachineTests: _TestCase`
`380`	`380`	`XCTAssertEqual(context.fromState, MyState.State0)`
`381`	`381`	`XCTAssertEqual(context.toState, MyState.State1)`
`382`	`382`
`383`		`- invokedCount++`
	`383`	`+ invokedCount += 1`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`}`
`@@ -700,7 +700,7 @@ class StateMachineTests: _TestCase`
`700`	`700`	`}`
`701`	`701`
`702`	`702`	`}, handler: { context in`
`703`		`- invokedCount++`
	`703`	`+ invokedCount += 1`
`704`	`704`	`})`
`705`	`705`
`706`	`706`	`}`