opened _currentContext

dileping · dileping · commit f6071f636474 · 2017-03-08T12:00:49.000+02:00
diff --git a/ExecutionContext/CustomExecutionContext.swift b/ExecutionContext/CustomExecutionContext.swift
@@ -27,11 +27,11 @@ public class CustomExecutionContext : ExecutionContextBase, ExecutionContextProt
     
     public func async(task:@escaping SafeTask) {
         executor {
-            let context = currentContext.value
+            let context = _currentContext.value
             defer {
-                currentContext.value = context
+                _currentContext.value = context
             }
-            currentContext.value = self
+            _currentContext.value = self
             
             task()
         }
diff --git a/ExecutionContext/DispatchExecutionContext.swift b/ExecutionContext/DispatchExecutionContext.swift
@@ -45,20 +45,20 @@
             self.loop = DispatchRunLoop(queue: queue)
             super.init()
             loop.execute {
-                currentContext.value = self
+                _currentContext.value = self
             }
         }
         
         public func async(task:@escaping SafeTask) {
             loop.execute {
-                currentContext.value = self
+                _currentContext.value = self
                 task()
             }
         }
         
         public func async(after:Timeout, task:@escaping SafeTask) {
             loop.execute(delay: after) {
-                currentContext.value = self
+                _currentContext.value = self
                 task()
             }
         }
@@ -69,7 +69,7 @@
             }
             
             return try loop.sync {
-                currentContext.value = self
+                _currentContext.value = self
                 return try task()
             }
         }
diff --git a/ExecutionContext/ExecutionContext.swift b/ExecutionContext/ExecutionContext.swift
@@ -192,19 +192,20 @@ public func executionContext(executor:@escaping Executor) -> ExecutionContextPro
     return CustomExecutionContext(executor: executor)
 }
 
-var currentContext = try! ThreadLocal<ExecutionContextProtocol>()
+//Never use it directly
+public var _currentContext = try! ThreadLocal<ExecutionContextProtocol>()
 
 public extension ExecutionContextProtocol {
     public static var current:ExecutionContextProtocol {
         get {
             if Thread.isMain {
                 return ExecutionContext.main
             }
-            if nil == currentContext.value {
+            if nil == _currentContext.value {
                 //TODO: think
 //                currentContext.value = RunLoopExecutionContext(inner: <#T##ExecutionContextType#>)
             }
-            return currentContext.value!
+            return _currentContext.value!
         }
     }
 }
diff --git a/ExecutionContext/ImmediateExecutionContext.swift b/ExecutionContext/ImmediateExecutionContext.swift
@@ -19,11 +19,11 @@ import Boilerplate
 
 class ImmediateExecutionContext : ExecutionContextBase, ExecutionContextProtocol {
     func async(task:@escaping SafeTask) {
-        let context = currentContext.value
+        let context = _currentContext.value
         defer {
-            currentContext.value = context
+            _currentContext.value = context
         }
-        currentContext.value = self
+        _currentContext.value = self
         
         task()
     }
@@ -36,11 +36,11 @@ class ImmediateExecutionContext : ExecutionContextBase, ExecutionContextProtocol
     }
     
     func sync<ReturnType>(task:@escaping TaskWithResult<ReturnType>) rethrows -> ReturnType {
-        let context = currentContext.value
+        let context = _currentContext.value
         defer {
-            currentContext.value = context
+            _currentContext.value = context
         }
-        currentContext.value = self
+        _currentContext.value = self
         
         return try task()
     }
diff --git a/ExecutionContext/RunLoopExecutionContext.swift b/ExecutionContext/RunLoopExecutionContext.swift
@@ -153,14 +153,14 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextPro
     
     public func async(task:@escaping SafeTask) {
         inner.async {
-            currentContext.value = self
+            _currentContext.value = self
             task()
         }
     }
     
     public func async(after:Timeout, task:@escaping SafeTask) {
         inner.async(after: after) {
-            currentContext.value = self
+            _currentContext.value = self
             task()
         }
     }
@@ -170,7 +170,7 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextPro
             return try task()
         }
         return try inner.sync {
-            currentContext.value = self
+            _currentContext.value = self
             return try task()
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ public class CustomExecutionContext : ExecutionContextBase, ExecutionContextProt`
`27`	`27`
`28`	`28`	`public func async(task:@escaping SafeTask) {`
`29`	`29`	`executor {`
`30`		`- let context = currentContext.value`
	`30`	`+ let context = _currentContext.value`
`31`	`31`	`defer {`
`32`		`- currentContext.value = context`
	`32`	`+ _currentContext.value = context`
`33`	`33`	`}`
`34`		`- currentContext.value = self`
	`34`	`+ _currentContext.value = self`
`35`	`35`
`36`	`36`	`task()`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,20 +45,20 @@`
`45`	`45`	`self.loop = DispatchRunLoop(queue: queue)`
`46`	`46`	`super.init()`
`47`	`47`	`loop.execute {`
`48`		`- currentContext.value = self`
	`48`	`+ _currentContext.value = self`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public func async(task:@escaping SafeTask) {`
`53`	`53`	`loop.execute {`
`54`		`- currentContext.value = self`
	`54`	`+ _currentContext.value = self`
`55`	`55`	`task()`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public func async(after:Timeout, task:@escaping SafeTask) {`
`60`	`60`	`loop.execute(delay: after) {`
`61`		`- currentContext.value = self`
	`61`	`+ _currentContext.value = self`
`62`	`62`	`task()`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -69,7 +69,7 @@`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`return try loop.sync {`
`72`		`- currentContext.value = self`
	`72`	`+ _currentContext.value = self`
`73`	`73`	`return try task()`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,19 +192,20 @@ public func executionContext(executor:@escaping Executor) -> ExecutionContextPro`
`192`	`192`	`return CustomExecutionContext(executor: executor)`
`193`	`193`	`}`
`194`	`194`
`195`		`-var currentContext = try! ThreadLocal<ExecutionContextProtocol>()`
	`195`	`+//Never use it directly`
	`196`	`+public var _currentContext = try! ThreadLocal<ExecutionContextProtocol>()`
`196`	`197`
`197`	`198`	`public extension ExecutionContextProtocol {`
`198`	`199`	`public static var current:ExecutionContextProtocol {`
`199`	`200`	`get {`
`200`	`201`	`if Thread.isMain {`
`201`	`202`	`return ExecutionContext.main`
`202`	`203`	`}`
`203`		`- if nil == currentContext.value {`
	`204`	`+ if nil == _currentContext.value {`
`204`	`205`	`//TODO: think`
`205`	`206`	`// currentContext.value = RunLoopExecutionContext(inner: <#T##ExecutionContextType#>)`
`206`	`207`	`}`
`207`		`- return currentContext.value!`
	`208`	`+ return _currentContext.value!`
`208`	`209`	`}`
`209`	`210`	`}`
`210`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ import Boilerplate`
`19`	`19`
`20`	`20`	`class ImmediateExecutionContext : ExecutionContextBase, ExecutionContextProtocol {`
`21`	`21`	`func async(task:@escaping SafeTask) {`
`22`		`- let context = currentContext.value`
	`22`	`+ let context = _currentContext.value`
`23`	`23`	`defer {`
`24`		`- currentContext.value = context`
	`24`	`+ _currentContext.value = context`
`25`	`25`	`}`
`26`		`- currentContext.value = self`
	`26`	`+ _currentContext.value = self`
`27`	`27`
`28`	`28`	`task()`
`29`	`29`	`}`
`@@ -36,11 +36,11 @@ class ImmediateExecutionContext : ExecutionContextBase, ExecutionContextProtocol`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func sync<ReturnType>(task:@escaping TaskWithResult<ReturnType>) rethrows -> ReturnType {`
`39`		`- let context = currentContext.value`
	`39`	`+ let context = _currentContext.value`
`40`	`40`	`defer {`
`41`		`- currentContext.value = context`
	`41`	`+ _currentContext.value = context`
`42`	`42`	`}`
`43`		`- currentContext.value = self`
	`43`	`+ _currentContext.value = self`
`44`	`44`
`45`	`45`	`return try task()`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,14 +153,14 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextPro`
`153`	`153`
`154`	`154`	`public func async(task:@escaping SafeTask) {`
`155`	`155`	`inner.async {`
`156`		`- currentContext.value = self`
	`156`	`+ _currentContext.value = self`
`157`	`157`	`task()`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`public func async(after:Timeout, task:@escaping SafeTask) {`
`162`	`162`	`inner.async(after: after) {`
`163`		`- currentContext.value = self`
	`163`	`+ _currentContext.value = self`
`164`	`164`	`task()`
`165`	`165`	`}`
`166`	`166`	`}`
`@@ -170,7 +170,7 @@ public class RunLoopExecutionContext : ExecutionContextBase, ExecutionContextPro`
`170`	`170`	`return try task()`
`171`	`171`	`}`
`172`	`172`	`return try inner.sync {`
`173`		`- currentContext.value = self`
	`173`	`+ _currentContext.value = self`
`174`	`174`	`return try task()`
`175`	`175`	`}`
`176`	`176`	`}`