Skip to content

Commit f9a9a72

Browse files
committed
Fix for Xcode7-beta5.
1 parent 66b6c3c commit f9a9a72

File tree

6 files changed

+29
-30
lines changed

6 files changed

+29
-30
lines changed

SwiftState/HierarchicalStateMachine.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMac
6161
{
6262
assert(state is HSM.State, "HSM state must be String.")
6363

64-
let components = split((state as! HSM.State).characters, maxSplit: 1) { $0 == "." }.map { String($0) }
64+
let components = (state as! HSM.State).characters.split { $0 == "." }.map { String($0) }
6565

6666
switch components.count {
6767
case 2:

SwiftState/StateMachine.swift

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,26 @@ internal class _StateMachineHandlerInfo<S: StateType, E: StateEventType>
8787

8888
public class StateMachine<S: StateType, E: StateEventType>
8989
{
90-
public typealias HandlerOrder = UInt8
91-
public typealias Handler = (HandlerContext -> Void)
92-
public typealias HandlerContext = (event: Event, transition: Transition, order: HandlerOrder, userInfo: Any?)
90+
public typealias State = S
91+
public typealias Event = E
92+
93+
public typealias Transition = StateTransition<State>
94+
public typealias TransitionChain = StateTransitionChain<State>
9395

94-
internal typealias State = S
95-
internal typealias Event = E
96-
internal typealias Transition = StateTransition<State>
97-
internal typealias TransitionChain = StateTransitionChain<State>
96+
public typealias Route = StateRoute<State>
97+
public typealias RouteID = StateMachineRouteID<State, Event>
98+
public typealias RouteChain = StateRouteChain<State>
9899

99-
internal typealias Route = StateRoute<State>
100-
internal typealias RouteKey = String
101-
internal typealias RouteID = StateMachineRouteID<State, Event>
102-
internal typealias RouteChain = StateRouteChain<State>
100+
public typealias Condition = Route.Condition
103101

104-
internal typealias Condition = Route.Condition
102+
public typealias HandlerOrder = UInt8
103+
public typealias Handler = (HandlerContext -> Void)
104+
public typealias HandlerContext = (event: Event, transition: Transition, order: HandlerOrder, userInfo: Any?)
105+
public typealias HandlerID = StateMachineHandlerID<State, Event>
105106

106-
internal typealias HandlerKey = String
107-
internal typealias HandlerID = StateMachineHandlerID<State, Event>
108-
internal typealias HandlerInfo = _StateMachineHandlerInfo<State, Event>
109-
// NOTE: don't use tuple due to Array's copying behavior for closure
110-
// private typealias HandlerInfo = (order: HandlerOrder, handlerKey: HandlerKey, handler: Handler)
107+
private typealias RouteKey = String
108+
private typealias HandlerKey = String
109+
private typealias HandlerInfo = _StateMachineHandlerInfo<State, Event>
111110

112111
private typealias TransitionRouteDictionary = [Transition : [RouteKey : Condition?]]
113112

SwiftState/StateRoute.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
public struct StateRoute<S: StateType>
1010
{
11-
internal typealias Condition = ((transition: Transition) -> Bool)
11+
public typealias Condition = ((transition: Transition) -> Bool)
1212

13-
private typealias State = S
14-
private typealias Transition = StateTransition<State>
13+
public typealias State = S
14+
public typealias Transition = StateTransition<State>
1515

1616
public let transition: Transition
1717
public let condition: Condition?

SwiftState/StateRouteChain.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
public struct StateRouteChain<S: StateType>
1010
{
11-
private typealias State = S
12-
private typealias Transition = StateTransition<State>
13-
private typealias TransitionChain = StateTransitionChain<State>
14-
private typealias Route = StateRoute<State>
15-
private typealias Condition = Route.Condition
11+
public typealias State = S
12+
public typealias Transition = StateTransition<State>
13+
public typealias TransitionChain = StateTransitionChain<State>
14+
public typealias Route = StateRoute<State>
15+
public typealias Condition = Route.Condition
1616

1717
internal var routes: [Route]
1818

SwiftState/StateTransition.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public struct StateTransition<S: StateType>: Hashable
1010
{
11-
private typealias State = S
11+
public typealias State = S
1212

1313
public let fromState: State
1414
public let toState: State

SwiftState/StateTransitionChain.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
public struct StateTransitionChain<S: StateType>
1010
{
11-
private typealias State = S
12-
private typealias Transition = StateTransition<State>
11+
public typealias State = S
12+
public typealias Transition = StateTransition<State>
1313

14-
private var states: [State]
14+
public var states: [State]
1515

1616
public init(transition: Transition)
1717
{

0 commit comments

Comments
 (0)