Merge pull request #22 from ReactKit/swift/1.2

Swift 1.2 Support

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:
@@ -85,7 +85,7 @@ public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMac
         let (submachine, substate) = self._submachineTupleForState(self._state)
 
         if let submachine = submachine {
-            self._state = "\(submachine.name).\(submachine.state)" as State
+            self._state = "\(submachine.name).\(submachine.state)" as! State
         }
 
         return self._state
@@ -147,7 +147,7 @@ public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMac
         // try changing submachine-internal state
         if fromSubmachine != nil && toSubmachine != nil && fromSubmachine === toSubmachine {
 
-            if toSubmachine!.canTryState(toSubstate, forEvent: event as HSM.Event) {
+            if toSubmachine!.canTryState(toSubstate, forEvent: event as! HSM.Event) {
 
                 //
                 // NOTE:

SwiftState/StateMachine.swift

@@ -26,11 +26,17 @@ 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
     }
 }
 
@@ -48,11 +54,16 @@ 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
     }
 }
 
@@ -77,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
@@ -226,7 +237,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
@@ -236,7 +247,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))
             }
         }
 
@@ -338,7 +349,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRoute(route)
     }
 
-    public func addRoute(transition: Transition, condition: @autoclosure () -> Bool) -> RouteID
+    public func addRoute(transition: Transition, @autoclosure(escaping) condition: () -> Bool) -> RouteID
     {
         return self.addRoute(transition, condition: { t in condition() })
     }
@@ -388,7 +399,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRoute(route, handler: handler)
     }
 
-    public func addRoute(transition: Transition, condition: @autoclosure () -> Bool, handler: Handler) -> (RouteID, HandlerID)
+    public func addRoute(transition: Transition, @autoclosure(escaping) condition: () -> Bool, handler: Handler) -> (RouteID, HandlerID)
     {
         return self.addRoute(transition, condition: { t in condition() }, handler: handler)
     }
@@ -403,7 +414,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)
                 }
             }
         }
@@ -620,7 +631,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRouteChain(routeChain, handler: handler)
     }
 
-    public func addRouteChain(chain: TransitionChain, condition: @autoclosure () -> Bool, handler: Handler) -> (RouteID, HandlerID)
+    public func addRouteChain(chain: TransitionChain, @autoclosure(escaping) condition: () -> Bool, handler: Handler) -> (RouteID, HandlerID)
     {
         return self.addRouteChain(chain, condition: { t in condition() }, handler: handler)
     }
@@ -743,7 +754,7 @@ public class StateMachine<S: StateType, E: StateEventType>
             if chainingCount < allCount {
                 shouldStop = true
                 if isError {
-                    handler(context: context)
+                    handler(context)
                 }
             }
         }
@@ -758,7 +769,7 @@ public class StateMachine<S: StateType, E: StateEventType>
                         shouldStop = true
 
                         if !isError {
-                            handler(context: context)
+                            handler(context)
                         }
                     }
                 }
@@ -786,7 +797,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         return self.addRouteEvent(event, routes: routes)
     }
 
-    public func addRouteEvent(event: Event, transitions: [Transition], condition: @autoclosure () -> Bool) -> [RouteID]
+    public func addRouteEvent(event: Event, transitions: [Transition], @autoclosure(escaping) condition: () -> Bool) -> [RouteID]
     {
         return self.addRouteEvent(event, transitions: transitions, condition: { t in condition() })
     }
@@ -818,7 +829,7 @@ public class StateMachine<S: StateType, E: StateEventType>
         return (routeIDs, handlerID)
     }
 
-    public func addRouteEvent(event: Event, transitions: [Transition], condition: @autoclosure () -> Bool, handler: Handler) -> ([RouteID], 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)
     }
@@ -845,7 +856,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,7 +22,7 @@ public struct StateRoute<S: StateType>
         self.condition = condition
     }
 
-    public init(transition: Transition, condition: @autoclosure () -> Bool)
+    public init(transition: Transition, @autoclosure(escaping) condition: () -> Bool)
     {
         self.init(transition: transition, condition: { t in condition() })
     }