Update project and code to Swift 4

adamyanalunas · adamyanalunas · commit d6d4d223dab6 · 2017-09-27T15:16:33.000-07:00
diff --git a/Sources/Machine.swift b/Sources/Machine.swift
@@ -383,7 +383,7 @@ public class Machine<S: StateType, E: EventType>
     // MARK: addRouteMapping + conditional handler
 
     @discardableResult
-    public func addRouteMapping(_ routeMapping: @escaping RouteMapping, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable
+    public func addRouteMapping(_ routeMapping: @escaping RouteMapping, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable
     {
         let routeDisposable = self.addRouteMapping(routeMapping)
 
@@ -425,13 +425,13 @@ public class Machine<S: StateType, E: EventType>
     // MARK: addHandler(event:)
 
     @discardableResult
-    public func addHandler(event: E, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable
+    public func addHandler(event: E, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable
     {
         return self.addHandler(event: .some(event), order: order, handler: handler)
     }
 
     @discardableResult
-    public func addHandler(event: Event<E>, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable
+    public func addHandler(event: Event<E>, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable
     {
         return self._addHandler(event: event, order: order) { context in
             // skip if not event-based transition
@@ -446,7 +446,7 @@ public class Machine<S: StateType, E: EventType>
     }
 
     @discardableResult
-    private func _addHandler(event: Event<E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    private func _addHandler(event: Event<E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         if self._handlers[event] == nil {
             self._handlers[event] = []
@@ -470,7 +470,7 @@ public class Machine<S: StateType, E: EventType>
     // MARK: addErrorHandler
 
     @discardableResult
-    public func addErrorHandler(order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addErrorHandler(order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         let key = _createUniqueString()
 
@@ -541,7 +541,7 @@ public func <-! <S, E>(machine: Machine<S, E>, tuple: (E, Any?)) -> Machine<S, E
 /// Precedence for registered handlers (higher number is called later).
 public typealias HandlerOrder = UInt8
 
-internal let _defaultOrder: HandlerOrder = 100
+public let DefaultOrder: HandlerOrder = 100
 
 //--------------------------------------------------
 // MARK: - Internal
diff --git a/Sources/StateMachine.swift b/Sources/StateMachine.swift
@@ -278,7 +278,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
     /// Add `handler` that is called when `tryState()` succeeds for target `transition`.
     /// - Note: `handler` will not be invoked for `tryEvent()`.
     @discardableResult
-    public func addHandler(_ transition: Transition<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addHandler(_ transition: Transition<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         if self._handlers[transition] == nil {
             self._handlers[transition] = []
@@ -322,7 +322,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
 
     /// Add `handler` that is called when either `tryEvent()` or `tryState()` succeeds for target `transition`.
     @discardableResult
-    public func addAnyHandler(_ transition: Transition<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addAnyHandler(_ transition: Transition<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         let disposable1 = self.addHandler(transition, order: order, handler: handler)
         let disposable2 = self.addHandler(event: .any, order: order) { context in
@@ -372,33 +372,33 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
     // MARK: addChainHandler
 
     @discardableResult
-    public func addChainHandler(_ chain: TransitionChain<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addChainHandler(_ chain: TransitionChain<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         return self.addChainHandler(RouteChain(transitionChain: chain), order: order, handler: handler)
     }
 
     @discardableResult
-    public func addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         return self._addChainHandler(chain, order: order, handler: handler, isError: false)
     }
 
     // MARK: addChainErrorHandler
 
     @discardableResult
-    public func addChainErrorHandler(_ chain: TransitionChain<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addChainErrorHandler(_ chain: TransitionChain<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         return self.addChainErrorHandler(RouteChain(transitionChain: chain), order: order, handler: handler)
     }
 
     @discardableResult
-    public func addChainErrorHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
+    public func addChainErrorHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
     {
         return self._addChainHandler(chain, order: order, handler: handler, isError: true)
     }
 
     @discardableResult
-    private func _addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler, isError: Bool) -> Disposable
+    private func _addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler, isError: Bool) -> Disposable
     {
         var handlerDisposables: [Disposable] = []
 
diff --git a/SwiftState.xcodeproj/project.pbxproj b/SwiftState.xcodeproj/project.pbxproj
@@ -317,11 +317,11 @@
 				TargetAttributes = {
 					1FA61FFF1996601000460108 = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					1FA6200A1996601000460108 = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -534,7 +534,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inamiy.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -554,7 +554,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inamiy.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -574,7 +574,7 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inamiy.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -590,7 +590,7 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.inamiy.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ public class Machine<S: StateType, E: EventType>`
`383`	`383`	`// MARK: addRouteMapping + conditional handler`
`384`	`384`
`385`	`385`	`@discardableResult`
`386`		`- public func addRouteMapping(_ routeMapping: @escaping RouteMapping, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable`
	`386`	`+ public func addRouteMapping(_ routeMapping: @escaping RouteMapping, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable`
`387`	`387`	`{`
`388`	`388`	`let routeDisposable = self.addRouteMapping(routeMapping)`
`389`	`389`
`@@ -425,13 +425,13 @@ public class Machine<S: StateType, E: EventType>`
`425`	`425`	`// MARK: addHandler(event:)`
`426`	`426`
`427`	`427`	`@discardableResult`
`428`		`- public func addHandler(event: E, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable`
	`428`	`+ public func addHandler(event: E, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable`
`429`	`429`	`{`
`430`	`430`	`return self.addHandler(event: .some(event), order: order, handler: handler)`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`@discardableResult`
`434`		`- public func addHandler(event: Event<E>, order: HandlerOrder = _defaultOrder, handler: @escaping Machine.Handler) -> Disposable`
	`434`	`+ public func addHandler(event: Event<E>, order: HandlerOrder = DefaultOrder, handler: @escaping Machine.Handler) -> Disposable`
`435`	`435`	`{`
`436`	`436`	`return self._addHandler(event: event, order: order) { context in`
`437`	`437`	`// skip if not event-based transition`
`@@ -446,7 +446,7 @@ public class Machine<S: StateType, E: EventType>`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`@discardableResult`
`449`		`- private func _addHandler(event: Event<E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`449`	`+ private func _addHandler(event: Event<E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`450`	`450`	`{`
`451`	`451`	`if self._handlers[event] == nil {`
`452`	`452`	`self._handlers[event] = []`
`@@ -470,7 +470,7 @@ public class Machine<S: StateType, E: EventType>`
`470`	`470`	`// MARK: addErrorHandler`
`471`	`471`
`472`	`472`	`@discardableResult`
`473`		`- public func addErrorHandler(order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`473`	`+ public func addErrorHandler(order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`474`	`474`	`{`
`475`	`475`	`let key = _createUniqueString()`
`476`	`476`
`@@ -541,7 +541,7 @@ public func <-! <S, E>(machine: Machine<S, E>, tuple: (E, Any?)) -> Machine<S, E`
`541`	`541`	`/// Precedence for registered handlers (higher number is called later).`
`542`	`542`	`public typealias HandlerOrder = UInt8`
`543`	`543`
`544`		`-internal let _defaultOrder: HandlerOrder = 100`
	`544`	`+public let DefaultOrder: HandlerOrder = 100`
`545`	`545`
`546`	`546`	`//--------------------------------------------------`
`547`	`547`	`// MARK: - Internal`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>`
`278`	`278`	/// Add `handler` that is called when `tryState()` succeeds for target `transition`.
`279`	`279`	/// - Note: `handler` will not be invoked for `tryEvent()`.
`280`	`280`	`@discardableResult`
`281`		`- public func addHandler(_ transition: Transition<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`281`	`+ public func addHandler(_ transition: Transition<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`282`	`282`	`{`
`283`	`283`	`if self._handlers[transition] == nil {`
`284`	`284`	`self._handlers[transition] = []`
`@@ -322,7 +322,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>`
`322`	`322`
`323`	`323`	/// Add `handler` that is called when either `tryEvent()` or `tryState()` succeeds for target `transition`.
`324`	`324`	`@discardableResult`
`325`		`- public func addAnyHandler(_ transition: Transition<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`325`	`+ public func addAnyHandler(_ transition: Transition<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`326`	`326`	`{`
`327`	`327`	`let disposable1 = self.addHandler(transition, order: order, handler: handler)`
`328`	`328`	`let disposable2 = self.addHandler(event: .any, order: order) { context in`
`@@ -372,33 +372,33 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>`
`372`	`372`	`// MARK: addChainHandler`
`373`	`373`
`374`	`374`	`@discardableResult`
`375`		`- public func addChainHandler(_ chain: TransitionChain<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`375`	`+ public func addChainHandler(_ chain: TransitionChain<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`376`	`376`	`{`
`377`	`377`	`return self.addChainHandler(RouteChain(transitionChain: chain), order: order, handler: handler)`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`@discardableResult`
`381`		`- public func addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`381`	`+ public func addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`382`	`382`	`{`
`383`	`383`	`return self._addChainHandler(chain, order: order, handler: handler, isError: false)`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`// MARK: addChainErrorHandler`
`387`	`387`
`388`	`388`	`@discardableResult`
`389`		`- public func addChainErrorHandler(_ chain: TransitionChain<S>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`389`	`+ public func addChainErrorHandler(_ chain: TransitionChain<S>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`390`	`390`	`{`
`391`	`391`	`return self.addChainErrorHandler(RouteChain(transitionChain: chain), order: order, handler: handler)`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`@discardableResult`
`395`		`- public func addChainErrorHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable`
	`395`	`+ public func addChainErrorHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable`
`396`	`396`	`{`
`397`	`397`	`return self._addChainHandler(chain, order: order, handler: handler, isError: true)`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`@discardableResult`
`401`		`- private func _addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = _defaultOrder, handler: @escaping Handler, isError: Bool) -> Disposable`
	`401`	`+ private func _addChainHandler(_ chain: RouteChain<S, E>, order: HandlerOrder = DefaultOrder, handler: @escaping Handler, isError: Bool) -> Disposable`
`402`	`402`	`{`
`403`	`403`	`var handlerDisposables: [Disposable] = []`
`404`	`404`