Skip to content

Commit 2a17aed

Browse files
committed
Automatic Swift 2.0 conversion
1 parent f94ff76 commit 2a17aed

File tree

9 files changed

+38
-37
lines changed

9 files changed

+38
-37
lines changed

SwiftState.xcodeproj/project.pbxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323
1FA61FF71996601000460108 /* Project object */ = {
324324
isa = PBXProject;
325325
attributes = {
326+
LastSwiftUpdateCheck = 0700;
326327
LastUpgradeCheck = 0600;
327328
ORGANIZATIONNAME = "Yasuhiro Inami";
328329
TargetAttributes = {

SwiftState/HierarchicalStateMachine.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public typealias HSM = HierarchicalStateMachine<String, String>
2424
//
2525

2626
/// nestable StateMachine with StateType as String
27-
public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMachine<S, E>, Printable
27+
public class HierarchicalStateMachine<S: StateType, E: StateEventType>: StateMachine<S, E>, CustomStringConvertible
2828
{
2929
private var _submachines = [String : HSM]()
3030

@@ -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, maxSplit: 1) { $0 == "." }
64+
let components = split((state as! HSM.State).characters, maxSplit: 1) { $0 == "." }.map { String($0) }
6565

6666
switch components.count {
6767
case 2:

SwiftState/StateMachine.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public class StateMachine<S: StateType, E: StateEventType>
268268
}
269269
}
270270

271-
validHandlerInfos.sort { info1, info2 in
271+
validHandlerInfos.sortInPlace { info1, info2 in
272272
return info1.order < info2.order
273273
}
274274

@@ -504,7 +504,7 @@ public class StateMachine<S: StateType, E: StateEventType>
504504
{
505505
var index = handlerInfos.count
506506

507-
for i in Array(0..<handlerInfos.count).reverse() {
507+
for i in Array(Array(0..<handlerInfos.count).reverse()) {
508508
if handlerInfos[i].order <= newHandlerInfo.order {
509509
break
510510
}
@@ -601,7 +601,7 @@ public class StateMachine<S: StateType, E: StateEventType>
601601
return self.addErrorHandler(order: self.dynamicType._defaultOrder, handler: handler)
602602
}
603603

604-
public func addErrorHandler(#order: HandlerOrder, handler: Handler) -> HandlerID
604+
public func addErrorHandler(order order: HandlerOrder, handler: Handler) -> HandlerID
605605
{
606606
let handlerKey = self.dynamicType._createUniqueString()
607607

SwiftState/StateRoute.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ public func => <S: StateType>(leftStates: [S], right: S) -> StateRoute<S>
4949
{
5050
// NOTE: don't reuse "nil => nil + condition" for efficiency
5151
return StateRoute(transition: nil => right, condition: { transition -> Bool in
52-
return contains(leftStates, transition.fromState)
52+
return leftStates.contains(transition.fromState)
5353
})
5454
}
5555

5656
/// e.g. .State0 => [.State1, .State2], allowing [0 => 1, 0 => 2]
5757
public func => <S: StateType>(left: S, rightStates: [S]) -> StateRoute<S>
5858
{
5959
return StateRoute(transition: left => nil, condition: { transition -> Bool in
60-
return contains(rightStates, transition.toState)
60+
return rightStates.contains(transition.toState)
6161
})
6262
}
6363

6464
/// e.g. [.State0, .State1] => [.State2, .State3], allowing [0 => 2, 0 => 3, 1 => 2, 1 => 3]
6565
public func => <S: StateType>(leftStates: [S], rightStates: [S]) -> StateRoute<S>
6666
{
6767
return StateRoute(transition: nil => nil, condition: { transition -> Bool in
68-
return contains(leftStates, transition.fromState) && contains(rightStates, transition.toState)
68+
return leftStates.contains(transition.fromState) && rightStates.contains(transition.toState)
6969
})
7070
}

SwiftState/StateTransition.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public func => <S: StateType>(left: S, right: S) -> StateTransition<S>
5858
// MARK: - Printable
5959
//--------------------------------------------------
6060

61-
extension StateTransition: Printable
61+
extension StateTransition: CustomStringConvertible
6262
{
6363
public var description: String
6464
{

SwiftStateTests/BasicTests.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ class BasicTests: _TestCase
1616
let machine = StateMachine<MyState, MyEvent>(state: .State0) { machine in
1717

1818
machine.addRoute(.State0 => .State1)
19-
machine.addRoute(nil => .State2) { context in println("Any => 2, msg=\(context.userInfo!)") }
20-
machine.addRoute(.State2 => nil) { context in println("2 => Any, msg=\(context.userInfo!)") }
19+
machine.addRoute(nil => .State2) { context in print("Any => 2, msg=\(context.userInfo!)") }
20+
machine.addRoute(.State2 => nil) { context in print("2 => Any, msg=\(context.userInfo!)") }
2121

2222
// add handler (handlerContext = (event, transition, order, userInfo))
2323
machine.addHandler(.State0 => .State1) { context in
24-
println("0 => 1")
24+
print("0 => 1")
2525
}
2626

2727
// add errorHandler
2828
machine.addErrorHandler { (event, transition, order, userInfo) in
29-
println("[ERROR] \(transition.fromState) => \(transition.toState)")
29+
print("[ERROR] \(transition.fromState) => \(transition.toState)")
3030
}
3131
}
3232

@@ -36,7 +36,7 @@ class BasicTests: _TestCase
3636
machine <- (.State1, "Bye")
3737
machine <- .State0 // fail: no 1 => 0
3838

39-
println("machine.state = \(machine.state)")
39+
print("machine.state = \(machine.state)")
4040
}
4141

4242
func testExample()
@@ -45,19 +45,19 @@ class BasicTests: _TestCase
4545

4646
// add 0 => 1
4747
$0.addRoute(.State0 => .State1) { context in
48-
println("[Transition 0=>1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
48+
print("[Transition 0=>1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
4949
}
5050
// add 0 => 1 once more
5151
$0.addRoute(.State0 => .State1) { context in
52-
println("[Transition 0=>1b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
52+
print("[Transition 0=>1b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
5353
}
5454
// add 2 => Any
5555
$0.addRoute(.State2 => nil) { context in
56-
println("[Transition exit 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue) (Any)")
56+
print("[Transition exit 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue) (Any)")
5757
}
5858
// add Any => 2
5959
$0.addRoute(nil => .State2) { context in
60-
println("[Transition Entry 2] \(context.transition.fromState.rawValue) (Any) => \(context.transition.toState.rawValue)")
60+
print("[Transition Entry 2] \(context.transition.fromState.rawValue) (Any) => \(context.transition.toState.rawValue)")
6161
}
6262
// add 1 => 0 (no handler)
6363
$0.addRoute(.State1 => .State0)
@@ -94,35 +94,35 @@ class BasicTests: _TestCase
9494

9595
// error
9696
$0.addErrorHandler { context in
97-
println("[ERROR 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
97+
print("[ERROR 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
9898
}
9999

100100
// entry
101101
$0.addEntryHandler(.State0) { context in
102-
println("[Entry 0] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)") // NOTE: this should not be called
102+
print("[Entry 0] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)") // NOTE: this should not be called
103103
}
104104
$0.addEntryHandler(.State1) { context in
105-
println("[Entry 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
105+
print("[Entry 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
106106
}
107107
$0.addEntryHandler(.State2) { context in
108-
println("[Entry 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
108+
print("[Entry 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
109109
}
110110
$0.addEntryHandler(.State2) { context in
111-
println("[Entry 2b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
111+
print("[Entry 2b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
112112
}
113113

114114
// exit
115115
$0.addExitHandler(.State0) { context in
116-
println("[Exit 0] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
116+
print("[Exit 0] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
117117
}
118118
$0.addExitHandler(.State1) { context in
119-
println("[Exit 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
119+
print("[Exit 1] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue)")
120120
}
121121
$0.addExitHandler(.State2) { context in
122-
println("[Exit 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
122+
print("[Exit 2] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
123123
}
124124
$0.addExitHandler(.State2) { context in
125-
println("[Exit 2b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
125+
print("[Exit 2b] \(context.transition.fromState.rawValue) => \(context.transition.toState.rawValue), userInfo = \(context.userInfo)")
126126
}
127127
}
128128

SwiftStateTests/HierarchicalStateMachineTests.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ class HierarchicalStateMachineTests: _TestCase
5151
mainMachine.addRoute("MainState0" => "Sub1.State1")
5252

5353
// add logging handlers
54-
sub1Machine.addHandler(nil => nil) { println("[Sub1] \($0.transition)") }
55-
sub1Machine.addErrorHandler { println("[ERROR][Sub1] \($0.transition)") }
56-
sub2Machine.addHandler(nil => nil) { println("[Sub2] \($0.transition)") }
57-
sub2Machine.addErrorHandler { println("[ERROR][Sub2] \($0.transition)") }
58-
mainMachine.addHandler(nil => nil) { println("[Main] \($0.transition)") }
59-
mainMachine.addErrorHandler { println("[ERROR][Main] \($0.transition)") }
54+
sub1Machine.addHandler(nil => nil) { print("[Sub1] \($0.transition)") }
55+
sub1Machine.addErrorHandler { print("[ERROR][Sub1] \($0.transition)") }
56+
sub2Machine.addHandler(nil => nil) { print("[Sub2] \($0.transition)") }
57+
sub2Machine.addErrorHandler { print("[ERROR][Sub2] \($0.transition)") }
58+
mainMachine.addHandler(nil => nil) { print("[Main] \($0.transition)") }
59+
mainMachine.addErrorHandler { print("[ERROR][Main] \($0.transition)") }
6060

6161
self.mainMachine = mainMachine
6262
self.sub1Machine = sub1Machine
@@ -166,7 +166,7 @@ class HierarchicalStateMachineTests: _TestCase
166166

167167
// NOTE: this handler is added to mainMachine and doesn't make submachines dirty
168168
mainMachine.addHandler("Sub1.State1" => "Sub1.State2") { context in
169-
println("[Main] 1-1 => 1-2 (specific)")
169+
print("[Main] 1-1 => 1-2 (specific)")
170170
didPass = true
171171
}
172172

SwiftStateTests/MyState.swift

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

99
import SwiftState
1010

11-
enum MyState: Int, StateType, Printable
11+
enum MyState: Int, StateType, CustomStringConvertible
1212
{
1313
case State0, State1, State2, State3
1414
case AnyState // IMPORTANT: create case=Any & use it in convertFromNilLiteral()

SwiftStateTests/_TestCase.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ class _TestCase: XCTestCase
1414
override func setUp()
1515
{
1616
super.setUp()
17-
println("\n\n\n")
17+
print("\n\n\n")
1818
}
1919

2020
override func tearDown()
2121
{
22-
println("\n\n\n")
22+
print("\n\n\n")
2323
super.tearDown()
2424
}
2525
}

0 commit comments

Comments
 (0)