Merge pull request #51 from mattprowse/swift/3.0

Xcode 8 beta 6 compatibility

Author: inamiy

Sources/Disposable.swift

@@ -34,7 +34,7 @@ public final class ActionDisposable: Disposable {
     }
 
     /// Initializes the disposable to run the given action upon disposal.
-    public init(action: () -> ()) {
+    public init(action: (() -> ())) {
         self.action = action
     }
 

Sources/Machine.swift

@@ -28,7 +28,7 @@ public class Machine<S: StateType, E: EventType>
 
     /// Closure-based route, mainly for `tryEvent()` (and also works for subclass's `tryState()`).
     /// - Returns: Preferred `toState`.
-    public typealias RouteMapping = (event: E?, fromState: S, userInfo: Any?) -> S?
+    public typealias RouteMapping = (_ event: E?, _ fromState: S, _ userInfo: Any?) -> S?
 
     internal typealias _RouteDict = [Transition<S> : [String : Condition?]]
 
@@ -142,7 +142,7 @@ public class Machine<S: StateType, E: EventType>
     private func _hasRouteMappingInDict(event: E?, fromState: S, toState: S?, userInfo: Any? = nil) -> S?
     {
         for mapping in self._routeMappings.values {
-            if let preferredToState = mapping(event: event, fromState: fromState, userInfo: userInfo),
+            if let preferredToState = mapping(event, fromState, userInfo),
                 preferredToState == toState || toState == nil
             {
                 return preferredToState
@@ -218,7 +218,7 @@ public class Machine<S: StateType, E: EventType>
         let validHandlerInfos = [ self._handlers[.some(event)], self._handlers[.any] ]
             .filter { $0 != nil }
             .map { $0! }
-            .flatten()
+            .joined()
 
         return validHandlerInfos.sorted { info1, info2 in
             return info1.order < info2.order
@@ -389,7 +389,7 @@ public class Machine<S: StateType, E: EventType>
 
         let handlerDisposable = self._addHandler(event: .any, order: order) { context in
 
-            guard let preferredToState = routeMapping(event: context.event, fromState: context.fromState, userInfo: context.userInfo),
+            guard let preferredToState = routeMapping(context.event, context.fromState, context.userInfo),
                 preferredToState == context.toState else
             {
                 return
@@ -518,7 +518,7 @@ public class Machine<S: StateType, E: EventType>
 
 // MARK: `<-!` (tryEvent)
 
-infix operator <-! { associativity left }
+infix operator <-! : AdditionPrecedence
 
 @discardableResult
 public func <-! <S: StateType, E: EventType>(machine: Machine<S, E>, event: E) -> Machine<S, E>
@@ -552,7 +552,7 @@ internal func _createUniqueString() -> String
 {
     var uniqueString: String = ""
     for _ in 1...8 {
-        uniqueString += String(UnicodeScalar(_random(0xD800))) // 0xD800 = 55296 = 15.755bit
+        uniqueString += String(describing: UnicodeScalar(_random(0xD800))) // 0xD800 = 55296 = 15.755bit
     }
     return uniqueString
 }

Sources/StateMachine.swift

@@ -16,7 +16,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
 {
     /// Closure-based routes for `tryState()`.
     /// - Returns: Multiple `toState`s from single `fromState`, similar to `.State0 => [.State1, .State2]`
-    public typealias StateRouteMapping = (fromState: S, userInfo: Any?) -> [S]?
+    public typealias StateRouteMapping = (_ fromState: S, _ userInfo: Any?) -> [S]?
 
     private lazy var _routes: _RouteDict = [:]
     private lazy var _routeMappings: [String : StateRouteMapping] = [:] // NOTE: `StateRouteMapping`, not `RouteMapping`
@@ -99,7 +99,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
     private func _hasRouteMappingInDict(fromState: S, toState: S, userInfo: Any? = nil) -> S?
     {
         for mapping in self._routeMappings.values {
-            if let preferredToStates = mapping(fromState: fromState, userInfo: userInfo) {
+            if let preferredToStates = mapping(fromState, userInfo) {
                 return preferredToStates.contains(toState) ? toState : nil
             }
         }
@@ -507,7 +507,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
 
             guard context.event == nil else { return }
 
-            guard let preferredToStates = routeMapping(fromState: context.fromState, userInfo: context.userInfo), preferredToStates.contains(context.toState) else
+            guard let preferredToStates = routeMapping(context.fromState, context.userInfo), preferredToStates.contains(context.toState) else
             {
                 return
             }
@@ -543,7 +543,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
 
 // MARK: `<-` (tryState)
 
-infix operator <- { associativity left }
+infix operator <- : AdditionPrecedence
 
 @discardableResult
 public func <- <S: StateType, E: EventType>(machine: StateMachine<S, E>, state: S) -> StateMachine<S, E>

Sources/Transition.swift

@@ -52,7 +52,7 @@ public func == <S: StateType>(left: Transition<S>, right: Transition<S>) -> Bool
 // MARK: - Custom Operators
 //--------------------------------------------------
 
-infix operator => { associativity left }
+infix operator => : AdditionPrecedence
 
 /// e.g. .State0 => .State1
 public func => <S: StateType>(left: State<S>, right: State<S>) -> Transition<S>