Skip to content

Commit 6bacb66

Browse files
committed
Simplify Array/Dictionary instantiation.
1 parent 03eec53 commit 6bacb66

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

SwiftState/StateMachine.swift

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

99
import Darwin
1010

11-
// TODO: change Array() to []
12-
// TODO: change Dictionary to []
1311
// TODO: change .append() to +=
1412

1513
// TODO: nest inside StateMachine class
@@ -106,9 +104,9 @@ public class StateMachine<S: StateType, E: StateEventType>
106104

107105
private typealias TransitionRouteDictionary = [Transition : [RouteKey : Condition?]]
108106

109-
private var _routes: [Event : TransitionRouteDictionary] = Dictionary()
110-
private var _handlers: [Transition : [HandlerInfo]] = Dictionary()
111-
private var _errorHandlers: [HandlerInfo] = Array()
107+
private var _routes: [Event : TransitionRouteDictionary] = [:]
108+
private var _handlers: [Transition : [HandlerInfo]] = [:]
109+
private var _errorHandlers: [HandlerInfo] = []
112110

113111
internal var _state: State
114112

@@ -274,7 +272,7 @@ public class StateMachine<S: StateType, E: StateEventType>
274272

275273
private func _validTransitionsForTransition(transition: Transition) -> [Transition]
276274
{
277-
var transitions: [Transition] = Array()
275+
var transitions: [Transition] = []
278276

279277
// anywhere
280278
transitions.append(nil => nil)
@@ -362,12 +360,12 @@ public class StateMachine<S: StateType, E: StateEventType>
362360
let condition = route.condition
363361

364362
if self._routes[event] == nil {
365-
self._routes[event] = Dictionary()
363+
self._routes[event] = [:]
366364
}
367365

368366
var transitionDict = self._routes[event]!
369367
if transitionDict[transition] == nil {
370-
transitionDict[transition] = Dictionary()
368+
transitionDict[transition] = [:]
371369
}
372370

373371
let routeKey = self.dynamicType._createUniqueString()
@@ -662,7 +660,7 @@ public class StateMachine<S: StateType, E: StateEventType>
662660

663661
public func addRouteChain(chain: RouteChain, handler: Handler) -> (RouteID, HandlerID)
664662
{
665-
var routeIDs: [RouteID] = Array()
663+
var routeIDs: [RouteID] = []
666664

667665
for route in chain.routes {
668666
let routeID = self.addRoute(route)
@@ -722,7 +720,7 @@ public class StateMachine<S: StateType, E: StateEventType>
722720

723721
private func _addChainHandler(chain: RouteChain, order: HandlerOrder, handler: Handler, isError: Bool) -> HandlerID
724722
{
725-
var handlerIDs: [HandlerID] = Array()
723+
var handlerIDs: [HandlerID] = []
726724

727725
var shouldStop = true
728726
var shouldIncrementChainingCount = true
@@ -820,7 +818,7 @@ public class StateMachine<S: StateType, E: StateEventType>
820818

821819
public func addRouteEvent(event: Event, transitions: [Transition], condition: Condition? = nil) -> [RouteID]
822820
{
823-
var routes: [Route] = Array()
821+
var routes: [Route] = []
824822
for transition in transitions {
825823
let route = Route(transition: transition, condition: condition)
826824
routes.append(route)
@@ -836,7 +834,7 @@ public class StateMachine<S: StateType, E: StateEventType>
836834

837835
public func addRouteEvent(event: Event, routes: [Route]) -> [RouteID]
838836
{
839-
var routeIDs: [RouteID] = Array()
837+
var routeIDs: [RouteID] = []
840838
for route in routes {
841839
let routeID = self._addRoute(route, forEvent: event)
842840
routeIDs.append(routeID)

SwiftState/StateRoute.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public struct StateRoute<S: StateType>
3838

3939
public func toRouteChain() -> StateRouteChain<State>
4040
{
41-
var routes: [StateRoute<State>] = Array()
41+
var routes: [StateRoute<State>] = []
4242
routes.append(self)
4343
return StateRouteChain(routes: routes)
4444
}

SwiftState/StateRouteChain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public struct StateRouteChain<S: StateType>
2323

2424
public init(transitionChain: TransitionChain, condition: Condition?)
2525
{
26-
var routes: [Route] = Array()
26+
var routes: [Route] = []
2727
for transition in transitionChain.transitions {
2828
routes.append(Route(transition: transition, condition: condition))
2929
}

SwiftState/StateTransitionChain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public struct StateTransitionChain<S: StateType>
3535

3636
public var transitions: [Transition]
3737
{
38-
var transitions: [Transition] = Array()
38+
var transitions: [Transition] = []
3939

4040
for i in 0..<states.count-1 {
4141
transitions.append(states[i] => states[i+1])

0 commit comments

Comments
 (0)