Explorar el Código

[std] make ThreadHandle private

Simon Krajewski hace 6 años
padre
commit
4fd3b7d7c6
Se han modificado 2 ficheros con 80 adiciones y 83 borrados
  1. 8 10
      std/cpp/_std/sys/thread/Thread.hx
  2. 72 73
      std/neko/_std/sys/thread/Thread.hx

+ 8 - 10
std/cpp/_std/sys/thread/Thread.hx

@@ -19,38 +19,36 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.thread;
 
-typedef ThreadHandle = Dynamic;
+private typedef ThreadHandle = Dynamic;
 
 @:coreApi
 class Thread {
-
-	var handle(default,null) : ThreadHandle;
+	var handle(default, null):ThreadHandle;
 
 	function new(h:ThreadHandle):Void {
 		handle = h;
 	}
 
-	public function sendMessage( msg : Dynamic ):Void {
-		untyped __global__.__hxcpp_thread_send(handle,msg);
+	public function sendMessage(msg:Dynamic):Void {
+		untyped __global__.__hxcpp_thread_send(handle, msg);
 	}
 
 	public static function current():Thread {
 		return new Thread(untyped __global__.__hxcpp_thread_current());
 	}
 
-	public static function create( callb : Void -> Void ):Thread {
+	public static function create(callb:Void->Void):Thread {
 		return new Thread(untyped __global__.__hxcpp_thread_create(callb));
 	}
 
-	public static function readMessage( block : Bool ) : Dynamic {
+	public static function readMessage(block:Bool):Dynamic {
 		return untyped __global__.__hxcpp_thread_read_message(block);
 	}
 
-	@:keep function __compare(t:Thread) : Int {
+	@:keep function __compare(t:Thread):Int {
 		return handle == t.handle ? 0 : 1;
 	}
-
 }
-

+ 72 - 73
std/neko/_std/sys/thread/Thread.hx

@@ -19,104 +19,103 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 package sys.thread;
 
 @:callable
 @:coreType
-abstract ThreadHandle {
-}
+private abstract ThreadHandle {}
 
 @:coreApi
 class Thread {
-
-	var handle : ThreadHandle;
+	var handle:ThreadHandle;
 
 	function new(h:ThreadHandle):Void {
 		handle = h;
 	}
 
-	public function sendMessage( msg : Dynamic ):Void {
-		thread_send(handle,msg);
+	public function sendMessage(msg:Dynamic):Void {
+		thread_send(handle, msg);
 	}
 
 	public static function current():Thread {
 		return new Thread(thread_current());
 	}
 
-	public static function create( callb : Void -> Void ):Thread {
-		return new Thread(thread_create(function(_) { return callb(); },null));
+	public static function create(callb:Void->Void):Thread {
+		return new Thread(thread_create(function(_) {
+			return callb();
+		}, null));
 	}
 
-	public static function readMessage( block : Bool ) : Dynamic {
+	public static function readMessage(block:Bool):Dynamic {
 		return thread_read_message(block);
 	}
 
 	@:keep function __compare(t:Dynamic):Int {
-		return untyped __dollar__compare(handle,t.handle);
-	}
-
-	/**
-		Starts an OS message loop after [osInitialize] has been done.
-		In that state, the UI handled by this thread will be updated and
-		[sync] calls can be performed. The loop returns when [exitLoop] is
-		called for this thread.
-	**
-	public static function osLoop() {
-		if( os_loop == null ) throw "Please call osInitialize() first";
-		os_loop();
+		return untyped __dollar__compare(handle, t.handle);
 	}
 
 	/**
-		The function [f] will be called by this thread if it's in [osLoop].
-		[sync] returns immediately. See [osInitialize] remarks.
-	**
-	public function sync( f : Void -> Void ) {
-		os_sync(handle,f);
-	}
-
-	/**
-		The function [f] will be called by this thread and the calling thread
-		will wait until the result is available then return its value.
-	**
-	public function syncResult<T>( f : Void -> T ) : T {
-		if( this == current() )
-			return f();
-		var v = new neko.vm.Lock();
-		var r = null;
-		sync(function() {
-			r = f();
-			v.release();
-		});
-		v.wait();
-		return r;
-	}
-
-	/**
-		Exit from [osLoop].
-	**
-	public function exitLoop() {
-		os_loop_stop(handle);
-	}
-
-	/**
-		If you want to use the [osLoop], [sync] and [syncResult] methods, you
-		need to call [osInitialize] before creating any thread or calling [current].
-		This will load [os.ndll] library and initialize UI methods for each thread.
-	**
-	public static function osInitialize() {
-		os_loop = neko.Lib.load("os","os_loop",0);
-		os_loop_stop = neko.Lib.load("os","os_loop_stop",1);
-		os_sync = neko.Lib.load("os","os_sync",2);
-	}
-
-	static var os_loop = null;
-	static var os_loop_stop = null;
-	static var os_sync = null;
-	*/
-
-	static var thread_create = neko.Lib.load("std","thread_create",2);
-	static var thread_current = neko.Lib.load("std","thread_current",0);
-	static var thread_send = neko.Lib.load("std","thread_send",2);
-	static var thread_read_message = neko.Lib.load("std","thread_read_message",1);
-
+			Starts an OS message loop after [osInitialize] has been done.
+			In that state, the UI handled by this thread will be updated and
+			[sync] calls can be performed. The loop returns when [exitLoop] is
+			called for this thread.
+		**
+		public static function osLoop() {
+			if( os_loop == null ) throw "Please call osInitialize() first";
+			os_loop();
+		}
+
+		/**
+			The function [f] will be called by this thread if it's in [osLoop].
+			[sync] returns immediately. See [osInitialize] remarks.
+		**
+		public function sync( f : Void -> Void ) {
+			os_sync(handle,f);
+		}
+
+		/**
+			The function [f] will be called by this thread and the calling thread
+			will wait until the result is available then return its value.
+		**
+		public function syncResult<T>( f : Void -> T ) : T {
+			if( this == current() )
+				return f();
+			var v = new neko.vm.Lock();
+			var r = null;
+			sync(function() {
+				r = f();
+				v.release();
+			});
+			v.wait();
+			return r;
+		}
+
+		/**
+			Exit from [osLoop].
+		**
+		public function exitLoop() {
+			os_loop_stop(handle);
+		}
+
+		/**
+			If you want to use the [osLoop], [sync] and [syncResult] methods, you
+			need to call [osInitialize] before creating any thread or calling [current].
+			This will load [os.ndll] library and initialize UI methods for each thread.
+		**
+		public static function osInitialize() {
+			os_loop = neko.Lib.load("os","os_loop",0);
+			os_loop_stop = neko.Lib.load("os","os_loop_stop",1);
+			os_sync = neko.Lib.load("os","os_sync",2);
+		}
+
+		static var os_loop = null;
+		static var os_loop_stop = null;
+		static var os_sync = null;
+	 */
+	static var thread_create = neko.Lib.load("std", "thread_create", 2);
+	static var thread_current = neko.Lib.load("std", "thread_current", 0);
+	static var thread_send = neko.Lib.load("std", "thread_send", 2);
+	static var thread_read_message = neko.Lib.load("std", "thread_read_message", 1);
 }