TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make private state of Sink private

This commit is contained in:
yury 2015-10-13 12:29:49 +03:00
parent ce5fe8d750
commit 2e556c209e
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RxSwift/Observables/Implementations/Sink.swift
View File

@ -9,22 +9,22 @@
import Foundation
class Sink<O : ObserverType> : Disposable {
private var lock = SpinLock()
private var _lock = SpinLock()
// state
var _observer: O?
var _cancel: Disposable
var _disposed: Bool = false
private var _observer: O?
private var _cancel: Disposable
private var _disposed: Bool = false
var observer: O? {
get {
return lock.calculateLocked { _observer }
return _lock.calculateLocked { _observer }
}
}
var cancel: Disposable {
get {
return lock.calculateLocked { _cancel }
return _lock.calculateLocked { _cancel }
}
}
@ -37,7 +37,7 @@ class Sink<O : ObserverType> : Disposable {
}
func dispose() {
let cancel: Disposable? = lock.calculateLocked {
let cancel: Disposable? = _lock.calculateLocked {
if _disposed {
return nil
}

6
RxSwift/Observables/Implementations/SkipUntil.swift
View File

@ -41,7 +41,7 @@ class SkipUntilSinkOther<ElementType, Other, O: ObserverType where O.E == Elemen
}
case .Error(let e):
_parent._lock.performLocked {
_parent._observer?.onError(e)
_parent.observer?.onError(e)
_parent.dispose()
}
case .Completed:
@ -87,14 +87,14 @@ class SkipUntilSink<ElementType, Other, O: ObserverType where O.E == ElementType
switch event {
case .Next:
if _forwardElements {
_observer?.on(event)
observer?.on(event)
}
case .Error:
observer?.on(event)
dispose()
case .Completed:
if _forwardElements {
_observer?.on(event)
observer?.on(event)
}
_singleAssignmentDisposable.dispose()
}

12
RxSwift/Observables/Implementations/SkipWhile.swift
View File

@ -26,17 +26,17 @@ class SkipWhileSink<ElementType, O: ObserverType where O.E == ElementType> : Sin
do {
_running = try !_parent._predicate(value)
} catch let e {
_observer?.onError(e)
observer?.onError(e)
dispose()
return
}
}
if _running {
_observer?.onNext(value)
observer?.onNext(value)
}
case .Error, .Completed:
_observer?.on(event)
observer?.on(event)
dispose()
}
}
@ -64,17 +64,17 @@ class SkipWhileSinkWithIndex<ElementType, O: ObserverType where O.E == ElementTy
_running = try !_parent._predicateWithIndex(value, _index)
_index += 1
} catch let e {
_observer?.onError(e)
observer?.onError(e)
dispose()
return
}
}
if _running {
_observer?.onNext(value)
observer?.onNext(value)
}
case .Error, .Completed:
_observer?.on(event)
observer?.on(event)
dispose()
}
}