Skip to content

Commit 2bdf6fa

Browse files
committed
Revert DefaultOrder property name to _defaultOrder
1 parent 6347e6c commit 2bdf6fa

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

Sources/Machine.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public class Machine<S: StateType, E: EventType>
383383
// MARK: addRouteMapping + conditional handler
384384

385385
@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
387387
{
388388
let routeDisposable = self.addRouteMapping(routeMapping)
389389

@@ -425,13 +425,13 @@ public class Machine<S: StateType, E: EventType>
425425
// MARK: addHandler(event:)
426426

427427
@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
429429
{
430430
return self.addHandler(event: .some(event), order: order, handler: handler)
431431
}
432432

433433
@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
435435
{
436436
return self._addHandler(event: event, order: order) { context in
437437
// skip if not event-based transition
@@ -446,7 +446,7 @@ public class Machine<S: StateType, E: EventType>
446446
}
447447

448448
@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
450450
{
451451
if self._handlers[event] == nil {
452452
self._handlers[event] = []
@@ -470,7 +470,7 @@ public class Machine<S: StateType, E: EventType>
470470
// MARK: addErrorHandler
471471

472472
@discardableResult
473-
public func addErrorHandler(order: HandlerOrder = DefaultOrder, handler: @escaping Handler) -> Disposable
473+
public func addErrorHandler(order: HandlerOrder = _defaultOrder, handler: @escaping Handler) -> Disposable
474474
{
475475
let key = _createUniqueString()
476476

@@ -541,7 +541,7 @@ public func <-! <S, E>(machine: Machine<S, E>, tuple: (E, Any?)) -> Machine<S, E
541541
/// Precedence for registered handlers (higher number is called later).
542542
public typealias HandlerOrder = UInt8
543543

544-
public let DefaultOrder: HandlerOrder = 100
544+
public let _defaultOrder: HandlerOrder = 100
545545

546546
//--------------------------------------------------
547547
// MARK: - Internal

Sources/StateMachine.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
278278
/// Add `handler` that is called when `tryState()` succeeds for target `transition`.
279279
/// - Note: `handler` will not be invoked for `tryEvent()`.
280280
@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
282282
{
283283
if self._handlers[transition] == nil {
284284
self._handlers[transition] = []
@@ -322,7 +322,7 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
322322

323323
/// Add `handler` that is called when either `tryEvent()` or `tryState()` succeeds for target `transition`.
324324
@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
326326
{
327327
let disposable1 = self.addHandler(transition, order: order, handler: handler)
328328
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>
372372
// MARK: addChainHandler
373373

374374
@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
376376
{
377377
return self.addChainHandler(RouteChain(transitionChain: chain), order: order, handler: handler)
378378
}
379379

380380
@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
382382
{
383383
return self._addChainHandler(chain, order: order, handler: handler, isError: false)
384384
}
385385

386386
// MARK: addChainErrorHandler
387387

388388
@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
390390
{
391391
return self.addChainErrorHandler(RouteChain(transitionChain: chain), order: order, handler: handler)
392392
}
393393

394394
@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
396396
{
397397
return self._addChainHandler(chain, order: order, handler: handler, isError: true)
398398
}
399399

400400
@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
402402
{
403403
var handlerDisposables: [Disposable] = []
404404

0 commit comments

Comments
 (0)