Merge pull request #18 from ReactKit/fix/Xcode6.3-beta2

Fix code for Xcode6.3 beta2.

Author: inamiy

SwiftState/HierarchicalStateMachine.swift

@@ -61,7 +61,7 @@ public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMac
     {
         assert(state is HSM.State, "HSM state must be String.")
 
-        let components = split(state as! HSM.State, { $0 == "." }, maxSplit: 1)
+        let components = split(state as! HSM.State, maxSplit: 1) { $0 == "." }
 
         switch components.count {
             case 2:

SwiftState/StateMachine.swift

@@ -26,14 +26,14 @@ public class StateMachineRouteID<S: StateType, E: StateEventType>
         self.transition = transition
         self.routeKey = routeKey
         self.event = event
-
+        
         self.bundledRouteIDs = nil
     }
 
     private init(bundledRouteIDs: [StateMachineRouteID<S, E>]?)
     {
         self.bundledRouteIDs = bundledRouteIDs
-
+        
         self.transition = nil
         self.routeKey = nil
         self.event = nil
@@ -54,14 +54,14 @@ public class StateMachineHandlerID<S: StateType, E: StateEventType>
     {
         self.transition = transition
         self.handlerKey = handlerKey
-
+        
         self.bundledHandlerIDs = nil
     }
 
     private init(bundledHandlerIDs: [StateMachineHandlerID<S, E>]?)
     {
         self.bundledHandlerIDs = bundledHandlerIDs
-
+        
         self.transition = nil
         self.handlerKey = nil
     }
@@ -88,7 +88,7 @@ internal class _StateMachineHandlerInfo<S: StateType, E: StateEventType>
 public class StateMachine<S: StateType, E: StateEventType>
 {
     public typealias HandlerOrder = UInt8
-    public typealias Handler = ((context: HandlerContext) -> Void)
+    public typealias Handler = (HandlerContext -> Void)
     public typealias HandlerContext = (event: Event, transition: Transition, order: HandlerOrder, userInfo: Any?)
 
     internal typealias State = S
@@ -238,7 +238,7 @@ public class StateMachine<S: StateType, E: StateEventType>
                 let order = handlerInfo.order
                 let handler = handlerInfo.handler
 
-                handler(context: HandlerContext(event: event, transition: transition, order: order, userInfo: userInfo))
+                handler(HandlerContext(event: event, transition: transition, order: order, userInfo: userInfo))
             }
 
             didTransit = true
@@ -248,7 +248,7 @@ public class StateMachine<S: StateType, E: StateEventType>
                 let order = handlerInfo.order
                 let handler = handlerInfo.handler
 
-                handler(context: HandlerContext(event: event, transition: transition, order: order, userInfo: userInfo))
+                handler(HandlerContext(event: event, transition: transition, order: order, userInfo: userInfo))
             }
         }
 
@@ -350,6 +350,11 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRoute(route)
     }
 
+    public func addRoute(transition: Transition, @autoclosure(escaping) condition: () -> Bool) -> RouteID
+    {
+        return self.addRoute(transition, condition: { t in condition() })
+    }
+    
     public func addRoute(route: Route) -> RouteID
     {
         return self._addRoute(route)
@@ -395,6 +400,11 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRoute(route, handler: handler)
     }
 
+    public func addRoute(transition: Transition, @autoclosure(escaping) condition: () -> Bool, handler: Handler) -> (RouteID, HandlerID)
+    {
+        return self.addRoute(transition, condition: { t in condition() }, handler: handler)
+    }
+    
     public func addRoute(route: Route, handler: Handler) -> (RouteID, HandlerID)
     {
         let transition = route.transition
@@ -405,7 +415,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         let handlerID = self.addHandler(transition) { [weak self] context in
             if let self_ = self {
                 if self_._canPassCondition(condition, transition: context.transition) {
-                    handler(context: context)
+                    handler(context)
                 }
             }
         }
@@ -622,6 +632,11 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRouteChain(routeChain, handler: handler)
     }
 
+    public func addRouteChain(chain: TransitionChain, @autoclosure(escaping) condition: () -> Bool, handler: Handler) -> (RouteID, HandlerID)
+    {
+        return self.addRouteChain(chain, condition: { t in condition() }, handler: handler)
+    }
+    
     public func addRouteChain(chain: RouteChain, handler: Handler) -> (RouteID, HandlerID)
     {
         var routeIDs: [RouteID] = []
@@ -740,7 +755,7 @@ public class StateMachine<S: StateType, E: StateEventType>
             if chainingCount < allCount {
                 shouldStop = true
                 if isError {
-                    handler(context: context)
+                    handler(context)
                 }
             }
         }
@@ -755,7 +770,7 @@ public class StateMachine<S: StateType, E: StateEventType>
                         shouldStop = true
 
                         if !isError {
-                            handler(context: context)
+                            handler(context)
                         }
                     }
                 }
@@ -783,6 +798,11 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRouteEvent(event, routes: routes)
     }
 
+    public func addRouteEvent(event: Event, transitions: [Transition], @autoclosure(escaping) condition: () -> Bool) -> [RouteID]
+    {
+        return self.addRouteEvent(event, transitions: transitions, condition: { t in condition() })
+    }
+    
     public func addRouteEvent(event: Event, routes: [Route]) -> [RouteID]
     {
         var routeIDs: [RouteID] = []
@@ -809,6 +829,11 @@ public class StateMachine<S: StateType, E: StateEventType>
 
         return (routeIDs, handlerID)
     }
+
+    public func addRouteEvent(event: Event, transitions: [Transition], @autoclosure(escaping) condition: () -> Bool, handler: Handler) -> ([RouteID], HandlerID)
+    {
+        return self.addRouteEvent(event, transitions: transitions, condition: { t in condition() }, handler: handler)
+    }
 
     public func addRouteEvent(event: Event, routes: [Route], handler: Handler) -> ([RouteID], HandlerID)
     {
@@ -832,7 +857,7 @@ public class StateMachine<S: StateType, E: StateEventType>
 
         let handlerID = self.addHandler(nil => nil, order: order) { [weak self] context in
             if context.event == event {
-                handler(context: context)
+                handler(context)
             }
         }
 

SwiftState/StateRoute.swift

@@ -22,6 +22,11 @@ public struct StateRoute<S: StateType>
         self.condition = condition
     }
 
+    public init(transition: Transition, @autoclosure(escaping) condition: () -> Bool)
+    {
+        self.init(transition: transition, condition: { t in condition() })
+    }
+    
     public func toTransition() -> Transition
     {
         return self.transition

SwiftStateTests/StateMachineChainTests.swift

@@ -50,11 +50,11 @@ class StateMachineChainTests: _TestCase
         var invokeCount = 0
 
         // add 0 => 1 => 2
-        machine.addRouteChain(.State0 => .State1 => .State2, condition: { _ in flag }) { (context) -> Void in
+        machine.addRouteChain(.State0 => .State1 => .State2, condition: flag) { context in
             invokeCount++
             return
         }
-
+        
         // tryState 0 => 1 => 2
         machine <- .State1
         machine <- .State2

SwiftStateTests/StateMachineTests.swift

@@ -103,7 +103,7 @@ class StateMachineTests: _TestCase
         var flag = false
 
         // add 0 => 1
-        machine.addRoute(.State0 => .State1, condition: { _ in flag })
+        machine.addRoute(.State0 => .State1, condition: flag)
 
         XCTAssertFalse(machine.hasRoute(.State0 => .State1))
 
@@ -161,7 +161,7 @@ class StateMachineTests: _TestCase
         machine.addRoute(.State0 => .State1)
 
         // add 0 => 1 with condition + conditionalHandler
-        machine.addRoute(.State0 => .State1, condition: { _ in flag }) { context in
+        machine.addRoute(.State0 => .State1, condition: flag) { context in
             returnedTransition = context.transition
         }
 

SwiftStateTests/StateRouteTests.swift

@@ -18,18 +18,10 @@ class StateRouteTests: _TestCase
         XCTAssertEqual(route.transition.toState, MyState.State1)
         XCTAssertTrue(route.condition == nil)
 
-        //
-        // comment-out: 
-        // `condition` using lazy-evaluated-@autoclosure is removed due to Swift 1.2 change
-        //
-        // From Release Note:
-        // > The @autoclosure attribute on parameters now implies the new @noescape attribute.
-        // > This intentionally limits the power of @autoclosure to control-flow and lazy evaluation use cases.
-        //
-//        let route2 = StateRoute<MyState>(transition: .State1 => .State2, condition: false)
-//        XCTAssertEqual(route2.transition.fromState, MyState.State1)
-//        XCTAssertEqual(route2.transition.toState, MyState.State2)
-//        XCTAssertTrue(route2.condition != nil)
+        let route2 = StateRoute<MyState>(transition: .State1 => .State2, condition: false)
+        XCTAssertEqual(route2.transition.fromState, MyState.State1)
+        XCTAssertEqual(route2.transition.toState, MyState.State2)
+        XCTAssertTrue(route2.condition != nil)
 
         let route3 = StateRoute<MyState>(transition: .State2 => .State3, condition: { transition in false })
         XCTAssertEqual(route3.transition.fromState, MyState.State2)