Rudy Ges 1 anno fa
parent
commit
945a106610

+ 0 - 2
README.md

@@ -21,8 +21,6 @@ Haxe allows you to compile for the following targets:
 
 
  * JavaScript
  * JavaScript
  * C++
  * C++
- * C#
- * Java
  * JVM
  * JVM
  * Lua
  * Lua
  * PHP 7
  * PHP 7

+ 1 - 0
src/optimization/analyzerTexpr.ml

@@ -672,6 +672,7 @@ module Fusion = struct
 					if not !found && (((has_state_read ir || has_any_field_read ir)) || has_state_write ir || has_any_field_write ir) then raise Exit;
 					if not !found && (((has_state_read ir || has_any_field_read ir)) || has_state_write ir || has_any_field_write ir) then raise Exit;
 					{e with eexpr = TCall(e1,el)}
 					{e with eexpr = TCall(e1,el)}
 				| TObjectDecl fl ->
 				| TObjectDecl fl ->
+					(* TODO can something be cleaned up here? *)
 					(* The C# generator has trouble with evaluation order in structures (#7531). *)
 					(* The C# generator has trouble with evaluation order in structures (#7531). *)
 					let el = handle_el (List.map snd fl) in
 					let el = handle_el (List.map snd fl) in
 					if not !found && (has_state_write ir || has_any_field_write ir) then raise Exit;
 					if not !found && (has_state_write ir || has_any_field_write ir) then raise Exit;

+ 1 - 1
std/StdTypes.hx

@@ -60,7 +60,7 @@
 **/
 **/
 @:coreType @:notNull @:runtimeValue abstract Int to Float {}
 @:coreType @:notNull @:runtimeValue abstract Int to Float {}
 
 
-#if (java || cs || hl || cpp)
+#if (java || hl || cpp)
 /**
 /**
 	Single-precision IEEE 32bit float (4-byte).
 	Single-precision IEEE 32bit float (4-byte).
 **/
 **/

+ 7 - 34
std/StringTools.hx

@@ -50,8 +50,6 @@ class StringTools {
 		return untyped s.__URLEncode();
 		return untyped s.__URLEncode();
 		#elseif java
 		#elseif java
 		return postProcessUrlEncode(java.net.URLEncoder.encode(s, "UTF-8"));
 		return postProcessUrlEncode(java.net.URLEncoder.encode(s, "UTF-8"));
-		#elseif cs
-		return untyped cs.system.Uri.EscapeDataString(s);
 		#elseif python
 		#elseif python
 		return python.lib.urllib.Parse.quote(s, "");
 		return python.lib.urllib.Parse.quote(s, "");
 		#elseif hl
 		#elseif hl
@@ -121,8 +119,6 @@ class StringTools {
 			return java.net.URLDecoder.decode(s, "UTF-8")
 			return java.net.URLDecoder.decode(s, "UTF-8")
 		catch (e:Dynamic)
 		catch (e:Dynamic)
 			throw e;
 			throw e;
-		#elseif cs
-		return untyped cs.system.Uri.UnescapeDataString(s);
 		#elseif python
 		#elseif python
 		return python.lib.urllib.Parse.unquote(s);
 		return python.lib.urllib.Parse.unquote(s);
 		#elseif hl
 		#elseif hl
@@ -223,11 +219,9 @@ class StringTools {
 
 
 		If `start` is the empty String `""`, the result is true.
 		If `start` is the empty String `""`, the result is true.
 	**/
 	**/
-	public static #if (cs || java || python || (js && js_es >= 6)) inline #end function startsWith(s:String, start:String):Bool {
+	public static #if (java || python || (js && js_es >= 6)) inline #end function startsWith(s:String, start:String):Bool {
 		#if java
 		#if java
 		return (cast s : java.NativeString).startsWith(start);
 		return (cast s : java.NativeString).startsWith(start);
-		#elseif cs
-		return untyped s.StartsWith(start);
 		#elseif hl
 		#elseif hl
 		return @:privateAccess (s.length >= start.length && s.bytes.compare(0, start.bytes, 0, start.length << 1) == 0);
 		return @:privateAccess (s.length >= start.length && s.bytes.compare(0, start.bytes, 0, start.length << 1) == 0);
 		#elseif python
 		#elseif python
@@ -248,11 +242,9 @@ class StringTools {
 
 
 		If `end` is the empty String `""`, the result is true.
 		If `end` is the empty String `""`, the result is true.
 	**/
 	**/
-	public static #if (cs || java || python || (js && js_es >= 6)) inline #end function endsWith(s:String, end:String):Bool {
+	public static #if (java || python || (js && js_es >= 6)) inline #end function endsWith(s:String, end:String):Bool {
 		#if java
 		#if java
 		return (cast s : java.NativeString).endsWith(end);
 		return (cast s : java.NativeString).endsWith(end);
-		#elseif cs
-		return untyped s.EndsWith(end);
 		#elseif hl
 		#elseif hl
 		var elen = end.length;
 		var elen = end.length;
 		var slen = s.length;
 		var slen = s.length;
@@ -297,10 +289,7 @@ class StringTools {
 		If `s` is the empty String `""` or consists only of space characters, the
 		If `s` is the empty String `""` or consists only of space characters, the
 		result is the empty String `""`.
 		result is the empty String `""`.
 	**/
 	**/
-	public #if cs inline #end static function ltrim(s:String):String {
-		#if cs
-		return untyped s.TrimStart();
-		#else
+	public inline static function ltrim(s:String):String {
 		var l = s.length;
 		var l = s.length;
 		var r = 0;
 		var r = 0;
 		while (r < l && isSpace(s, r)) {
 		while (r < l && isSpace(s, r)) {
@@ -310,7 +299,6 @@ class StringTools {
 			return s.substr(r, l - r);
 			return s.substr(r, l - r);
 		else
 		else
 			return s;
 			return s;
-		#end
 	}
 	}
 
 
 	/**
 	/**
@@ -322,10 +310,7 @@ class StringTools {
 		If `s` is the empty String `""` or consists only of space characters, the
 		If `s` is the empty String `""` or consists only of space characters, the
 		result is the empty String `""`.
 		result is the empty String `""`.
 	**/
 	**/
-	public #if cs inline #end static function rtrim(s:String):String {
-		#if cs
-		return untyped s.TrimEnd();
-		#else
+	public inline static function rtrim(s:String):String {
 		var l = s.length;
 		var l = s.length;
 		var r = 0;
 		var r = 0;
 		while (r < l && isSpace(s, l - r - 1)) {
 		while (r < l && isSpace(s, l - r - 1)) {
@@ -336,7 +321,6 @@ class StringTools {
 		} else {
 		} else {
 			return s;
 			return s;
 		}
 		}
-		#end
 	}
 	}
 
 
 	/**
 	/**
@@ -344,10 +328,8 @@ class StringTools {
 
 
 		This is a convenience function for `ltrim(rtrim(s))`.
 		This is a convenience function for `ltrim(rtrim(s))`.
 	**/
 	**/
-	public #if (cs || java) inline #end static function trim(s:String):String {
-		#if cs
-		return untyped s.Trim();
-		#elseif java
+	public #if java inline #end static function trim(s:String):String {
+		#if java
 		return (cast s : java.NativeString).trim();
 		return (cast s : java.NativeString).trim();
 		#else
 		#else
 		return ltrim(rtrim(s));
 		return ltrim(rtrim(s));
@@ -419,11 +401,6 @@ class StringTools {
 			return s.split(sub).join(by);
 			return s.split(sub).join(by);
 		else
 		else
 			return (cast s : java.NativeString).replace(sub, by);
 			return (cast s : java.NativeString).replace(sub, by);
-		#elseif cs
-		if (sub.length == 0)
-			return s.split(sub).join(by);
-		else
-			return untyped s.Replace(sub, by);
 		#else
 		#else
 		return s.split(sub).join(by);
 		return s.split(sub).join(by);
 		#end
 		#end
@@ -486,8 +463,6 @@ class StringTools {
 		return untyped s.cca(index);
 		return untyped s.cca(index);
 		#elseif java
 		#elseif java
 		return (index < s.length) ? cast(_charAt(s, index), Int) : -1;
 		return (index < s.length) ? cast(_charAt(s, index), Int) : -1;
-		#elseif cs
-		return (cast(index, UInt) < s.length) ? cast(s[index], Int) : -1;
 		#elseif js
 		#elseif js
 		return (cast s).charCodeAt(index);
 		return (cast s).charCodeAt(index);
 		#elseif python
 		#elseif python
@@ -525,8 +500,6 @@ class StringTools {
 		return untyped s.cca(index);
 		return untyped s.cca(index);
 		#elseif java
 		#elseif java
 		return cast(_charAt(s, index), Int);
 		return cast(_charAt(s, index), Int);
-		#elseif cs
-		return cast(s[index], Int);
 		#elseif js
 		#elseif js
 		return (cast s).charCodeAt(index);
 		return (cast s).charCodeAt(index);
 		#elseif python
 		#elseif python
@@ -576,7 +549,7 @@ class StringTools {
 		return c != c; // fast NaN
 		return c != c; // fast NaN
 		#elseif (neko || lua || eval)
 		#elseif (neko || lua || eval)
 		return c == null;
 		return c == null;
-		#elseif (cs || java || python)
+		#elseif (java || python)
 		return c == -1;
 		return c == -1;
 		#else
 		#else
 		return false;
 		return false;

+ 0 - 2
std/Sys.hx

@@ -43,8 +43,6 @@ extern class Sys {
 		This does not include the interpreter or the name of the program file.
 		This does not include the interpreter or the name of the program file.
 
 
 		(java)(eval) On Windows, non-ASCII Unicode arguments will not work correctly.
 		(java)(eval) On Windows, non-ASCII Unicode arguments will not work correctly.
-
-		(cs) Non-ASCII Unicode arguments will not work correctly.
 	**/
 	**/
 	static function args():Array<String>;
 	static function args():Array<String>;
 
 

+ 3 - 3
std/UInt.hx

@@ -19,9 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * DEALINGS IN THE SOFTWARE.
  */
  */
-#if ((flash || flash9doc || cs || hl) && !doc_gen)
+#if ((flash || flash9doc || hl) && !doc_gen)
 /**
 /**
-	The unsigned `Int` type is only defined for Flash and C#. It's currently
+	The unsigned `Int` type is only defined for Flash. It's currently
 	handled the same as a normal Int.
 	handled the same as a normal Int.
 
 
 	@see https://haxe.org/manual/types-basic-types.html
 	@see https://haxe.org/manual/types-basic-types.html
@@ -125,7 +125,7 @@ abstract UInt to Int from Int {
 #else
 #else
 
 
 /**
 /**
-	The unsigned `Int` type is only defined for Flash and C#.
+	The unsigned `Int` type is only defined for Flash.
 	Simulate it for other platforms.
 	Simulate it for other platforms.
 
 
 	@see https://haxe.org/manual/types-basic-types.html
 	@see https://haxe.org/manual/types-basic-types.html

+ 11 - 11
std/haxe/Serializer.hx

@@ -257,14 +257,14 @@ class Serializer {
 				}
 				}
 				if (useCache && serializeRef(v))
 				if (useCache && serializeRef(v))
 					return;
 					return;
-				switch (#if (neko || cs || python) Type.getClassName(c) #else c #end) {
-					case #if (neko || cs || python) "Array" #else cast Array #end:
+				switch (#if (neko || python) Type.getClassName(c) #else c #end) {
+					case #if (neko || python) "Array" #else cast Array #end:
 						var ucount = 0;
 						var ucount = 0;
 						buf.add("a");
 						buf.add("a");
 						#if (flash || python || hl)
 						#if (flash || python || hl)
 						var v:Array<Dynamic> = v;
 						var v:Array<Dynamic> = v;
 						#end
 						#end
-						var l = #if (neko || flash || php || cs || java || python || hl || lua || eval) v.length #elseif cpp v.__length() #else __getField(v,
+						var l = #if (neko || flash || php || java || python || hl || lua || eval) v.length #elseif cpp v.__length() #else __getField(v,
 							"length") #end;
 							"length") #end;
 						for (i in 0...l) {
 						for (i in 0...l) {
 							if (v[i] == null)
 							if (v[i] == null)
@@ -291,17 +291,17 @@ class Serializer {
 							}
 							}
 						}
 						}
 						buf.add("h");
 						buf.add("h");
-					case #if (neko || cs || python) "haxe.ds.List" #else cast List #end:
+					case #if (neko || python) "haxe.ds.List" #else cast List #end:
 						buf.add("l");
 						buf.add("l");
 						var v:List<Dynamic> = v;
 						var v:List<Dynamic> = v;
 						for (i in v)
 						for (i in v)
 							serialize(i);
 							serialize(i);
 						buf.add("h");
 						buf.add("h");
-					case #if (neko || cs || python) "Date" #else cast Date #end:
+					case #if (neko || python) "Date" #else cast Date #end:
 						var d:Date = v;
 						var d:Date = v;
 						buf.add("v");
 						buf.add("v");
 						buf.add(d.getTime());
 						buf.add(d.getTime());
-					case #if (neko || cs || python) "haxe.ds.StringMap" #else cast haxe.ds.StringMap #end:
+					case #if (neko || python) "haxe.ds.StringMap" #else cast haxe.ds.StringMap #end:
 						buf.add("b");
 						buf.add("b");
 						var v:haxe.ds.StringMap<Dynamic> = v;
 						var v:haxe.ds.StringMap<Dynamic> = v;
 						for (k in v.keys()) {
 						for (k in v.keys()) {
@@ -309,7 +309,7 @@ class Serializer {
 							serialize(v.get(k));
 							serialize(v.get(k));
 						}
 						}
 						buf.add("h");
 						buf.add("h");
-					case #if (neko || cs || python) "haxe.ds.IntMap" #else cast haxe.ds.IntMap #end:
+					case #if (neko || python) "haxe.ds.IntMap" #else cast haxe.ds.IntMap #end:
 						buf.add("q");
 						buf.add("q");
 						var v:haxe.ds.IntMap<Dynamic> = v;
 						var v:haxe.ds.IntMap<Dynamic> = v;
 						for (k in v.keys()) {
 						for (k in v.keys()) {
@@ -318,7 +318,7 @@ class Serializer {
 							serialize(v.get(k));
 							serialize(v.get(k));
 						}
 						}
 						buf.add("h");
 						buf.add("h");
-					case #if (neko || cs || python) "haxe.ds.ObjectMap" #else cast haxe.ds.ObjectMap #end:
+					case #if (neko || python) "haxe.ds.ObjectMap" #else cast haxe.ds.ObjectMap #end:
 						buf.add("M");
 						buf.add("M");
 						var v:haxe.ds.ObjectMap<Dynamic, Dynamic> = v;
 						var v:haxe.ds.ObjectMap<Dynamic, Dynamic> = v;
 						for (k in v.keys()) {
 						for (k in v.keys()) {
@@ -333,7 +333,7 @@ class Serializer {
 							serialize(v.get(k));
 							serialize(v.get(k));
 						}
 						}
 						buf.add("h");
 						buf.add("h");
-					case #if (neko || cs || python) "haxe.io.Bytes" #else cast haxe.io.Bytes #end:
+					case #if (neko || python) "haxe.io.Bytes" #else cast haxe.io.Bytes #end:
 						var v:haxe.io.Bytes = v;
 						var v:haxe.io.Bytes = v;
 						#if neko
 						#if neko
 						var chars = new String(base_encode(v.getData(), untyped BASE64.__s));
 						var chars = new String(base_encode(v.getData(), untyped BASE64.__s));
@@ -389,7 +389,7 @@ class Serializer {
 						if (#if flash try
 						if (#if flash try
 							v.hxSerialize != null
 							v.hxSerialize != null
 						catch (e:Dynamic)
 						catch (e:Dynamic)
-							false #elseif (cs || java || python) Reflect.hasField(v,
+							false #elseif (java || python) Reflect.hasField(v,
 								"hxSerialize") #elseif php php.Global.method_exists(v, 'hxSerialize') #else v.hxSerialize != null #end) {
 								"hxSerialize") #elseif php php.Global.method_exists(v, 'hxSerialize') #else v.hxSerialize != null #end) {
 							buf.add("C");
 							buf.add("C");
 							serializeString(Type.getClassName(c));
 							serializeString(Type.getClassName(c));
@@ -499,7 +499,7 @@ class Serializer {
 						#end
 						#end
 					}
 					}
 				}
 				}
-				#elseif (java || cs || python || hl || eval)
+				#elseif (java || python || hl || eval)
 				if (useEnumIndex) {
 				if (useEnumIndex) {
 					buf.add(":");
 					buf.add(":");
 					buf.add(Type.enumIndex(v));
 					buf.add(Type.enumIndex(v));

+ 4 - 4
std/haxe/crypto/Md5.hx

@@ -93,11 +93,11 @@ class Md5 {
 
 
 		// preallocate size
 		// preallocate size
 		var blksSize = nblk * 16;
 		var blksSize = nblk * 16;
-		#if (neko || cs || cpp || java || hl)
+		#if (neko || cpp || java || hl)
 		blks[blksSize - 1] = 0;
 		blks[blksSize - 1] = 0;
 		#end
 		#end
 
 
-		#if !(cpp || cs || hl) // C++ and C# will already initialize them with zeroes.
+		#if !(cpp || hl) // C++ will already initialize them with zeroes.
 		for (i in 0...blksSize)
 		for (i in 0...blksSize)
 			blks[i] = 0;
 			blks[i] = 0;
 		#end
 		#end
@@ -126,11 +126,11 @@ class Md5 {
 
 
 		// preallocate size
 		// preallocate size
 		var blksSize = nblk * 16;
 		var blksSize = nblk * 16;
-		#if (neko || eval || cs || cpp || java || hl)
+		#if (neko || eval || cpp || java || hl)
 		blks[blksSize - 1] = 0;
 		blks[blksSize - 1] = 0;
 		#end
 		#end
 
 
-		#if !(cpp || cs || hl) // C++ and C# will already initialize them with zeroes.
+		#if !(cpp || hl) // C++ will already initialize them with zeroes.
 		for (i in 0...blksSize)
 		for (i in 0...blksSize)
 			blks[i] = 0;
 			blks[i] = 0;
 		#end
 		#end

+ 0 - 1
std/haxe/display/Display.hx

@@ -296,7 +296,6 @@ enum abstract Platform(String) {
 	var Flash = "flash";
 	var Flash = "flash";
 	var Php = "php";
 	var Php = "php";
 	var Cpp = "cpp";
 	var Cpp = "cpp";
-	var Cs = "cs";
 	var Java = "java";
 	var Java = "java";
 	var Python = "python";
 	var Python = "python";
 	var Hl = "hl";
 	var Hl = "hl";

+ 5 - 17
std/haxe/ds/Vector.hx

@@ -31,8 +31,6 @@ private typedef VectorData<T> =
 	flash.Vector<T>
 	flash.Vector<T>
 	#elseif neko
 	#elseif neko
 	neko.NativeArray<T>
 	neko.NativeArray<T>
-	#elseif cs
-	cs.NativeArray<T>
 	#elseif java
 	#elseif java
 	java.NativeArray<T>
 	java.NativeArray<T>
 	#elseif lua
 	#elseif lua
@@ -68,8 +66,6 @@ abstract Vector<T>(VectorData<T>) {
 		this = untyped __dollar__amake(length);
 		this = untyped __dollar__amake(length);
 		#elseif js
 		#elseif js
 		this = js.Syntax.construct(Array, length);
 		this = js.Syntax.construct(Array, length);
-		#elseif cs
-		this = new cs.NativeArray(length);
 		#elseif java
 		#elseif java
 		this = new java.NativeArray(length);
 		this = new java.NativeArray(length);
 		#elseif cpp
 		#elseif cpp
@@ -104,8 +100,6 @@ abstract Vector<T>(VectorData<T>) {
 		this = new flash.Vector<T>(length, true);
 		this = new flash.Vector<T>(length, true);
 		#elseif neko
 		#elseif neko
 		this = untyped __dollar__amake(length);
 		this = untyped __dollar__amake(length);
-		#elseif cs
-		this = new cs.NativeArray(length);
 		#elseif java
 		#elseif java
 		this = new java.NativeArray(length);
 		this = new java.NativeArray(length);
 		#elseif cpp
 		#elseif cpp
@@ -167,8 +161,6 @@ abstract Vector<T>(VectorData<T>) {
 	inline function get_length():Int {
 	inline function get_length():Int {
 		#if neko
 		#if neko
 		return untyped __dollar__asize(this);
 		return untyped __dollar__asize(this);
-		#elseif cs
-		return this.Length;
 		#elseif java
 		#elseif java
 		return this.length;
 		return this.length;
 		#elseif python
 		#elseif python
@@ -191,13 +183,11 @@ abstract Vector<T>(VectorData<T>) {
 		The results are unspecified if `length` results in out-of-bounds access,
 		The results are unspecified if `length` results in out-of-bounds access,
 		or if `src` or `dest` are null
 		or if `src` or `dest` are null
 	**/
 	**/
-	public static #if (cs || java || neko || cpp || eval) inline #end function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void {
+	public static #if (java || neko || cpp || eval) inline #end function blit<T>(src:Vector<T>, srcPos:Int, dest:Vector<T>, destPos:Int, len:Int):Void {
 		#if neko
 		#if neko
 		untyped __dollar__ablit(dest, destPos, src, srcPos, len);
 		untyped __dollar__ablit(dest, destPos, src, srcPos, len);
 		#elseif java
 		#elseif java
 		java.lang.System.arraycopy(src, srcPos, dest, destPos, len);
 		java.lang.System.arraycopy(src, srcPos, dest, destPos, len);
-		#elseif cs
-		cs.system.Array.Copy(cast src, srcPos, cast dest, destPos, len);
 		#elseif cpp
 		#elseif cpp
 		dest.toData().blit(destPos, src.toData(), srcPos, len);
 		dest.toData().blit(destPos, src.toData(), srcPos, len);
 		#elseif eval
 		#elseif eval
@@ -291,8 +281,6 @@ abstract Vector<T>(VectorData<T>) {
 		return fromData(flash.Vector.ofArray(array));
 		return fromData(flash.Vector.ofArray(array));
 		#elseif java
 		#elseif java
 		return fromData(java.Lib.nativeArray(array, false));
 		return fromData(java.Lib.nativeArray(array, false));
-		#elseif cs
-		return fromData(cs.Lib.nativeArray(array, false));
 		#elseif cpp
 		#elseif cpp
 		return cast array.copy();
 		return cast array.copy();
 		#elseif js
 		#elseif js
@@ -315,7 +303,7 @@ abstract Vector<T>(VectorData<T>) {
 		`a[i] == a.copy()[i]` is true for any valid `i`. However,
 		`a[i] == a.copy()[i]` is true for any valid `i`. However,
 		`a == a.copy()` is always false.
 		`a == a.copy()` is always false.
 	**/
 	**/
-	#if cs extern #end public inline function copy<T>():Vector<T> {
+	extern public inline function copy<T>():Vector<T> {
 		#if eval
 		#if eval
 		return fromData(this.copy());
 		return fromData(this.copy());
 		#else
 		#else
@@ -338,7 +326,7 @@ abstract Vector<T>(VectorData<T>) {
 
 
 		If `sep` is null, the result is unspecified.
 		If `sep` is null, the result is unspecified.
 	**/
 	**/
-	#if cs extern #end public inline function join<T>(sep:String):String {
+	extern public inline function join<T>(sep:String):String {
 		#if (flash10 || cpp || eval)
 		#if (flash10 || cpp || eval)
 		return this.join(sep);
 		return this.join(sep);
 		#else
 		#else
@@ -361,7 +349,7 @@ abstract Vector<T>(VectorData<T>) {
 
 
 		If `f` is null, the result is unspecified.
 		If `f` is null, the result is unspecified.
 	**/
 	**/
-	#if cs extern #end public inline function map<S>(f:T->S):Vector<S> {
+	extern public inline function map<S>(f:T->S):Vector<S> {
 		#if eval
 		#if eval
 		return fromData(this.map(f));
 		return fromData(this.map(f));
 		#else
 		#else
@@ -389,7 +377,7 @@ abstract Vector<T>(VectorData<T>) {
 		If `f` is null, the result is unspecified.
 		If `f` is null, the result is unspecified.
 	**/
 	**/
 	public inline function sort(f:T->T->Int):Void {
 	public inline function sort(f:T->T->Int):Void {
-		#if (neko || cs || java || eval)
+		#if (neko || java || eval)
 		throw "not yet supported";
 		throw "not yet supported";
 		#elseif lua
 		#elseif lua
 		haxe.ds.ArraySort.sort(cast this, f);
 		haxe.ds.ArraySort.sort(cast this, f);

+ 1 - 31
std/haxe/io/Bytes.hx

@@ -70,8 +70,6 @@ class Bytes {
 		untyped b[pos] = v;
 		untyped b[pos] = v;
 		#elseif java
 		#elseif java
 		b[pos] = cast v;
 		b[pos] = cast v;
-		#elseif cs
-		b[pos] = cast v;
 		#elseif python
 		#elseif python
 		python.Syntax.arraySet(b, pos, v & 0xFF);
 		python.Syntax.arraySet(b, pos, v & 0xFF);
 		#else
 		#else
@@ -103,8 +101,6 @@ class Bytes {
 			b.writeBytes(src.b, srcpos, len);
 			b.writeBytes(src.b, srcpos, len);
 		#elseif java
 		#elseif java
 		java.lang.System.arraycopy(src.b, srcpos, b, pos, len);
 		java.lang.System.arraycopy(src.b, srcpos, b, pos, len);
-		#elseif cs
-		cs.system.Array.Copy(src.b, srcpos, b, pos, len);
 		#elseif python
 		#elseif python
 		python.Syntax.code("self.b[{0}:{0}+{1}] = src.b[srcpos:srcpos+{1}]", pos, len);
 		python.Syntax.code("self.b[{0}:{0}+{1}] = src.b[srcpos:srcpos+{1}]", pos, len);
 		#elseif cpp
 		#elseif cpp
@@ -168,17 +164,13 @@ class Bytes {
 		var newarr = new java.NativeArray(len);
 		var newarr = new java.NativeArray(len);
 		java.lang.System.arraycopy(b, pos, newarr, 0, len);
 		java.lang.System.arraycopy(b, pos, newarr, 0, len);
 		return new Bytes(len, newarr);
 		return new Bytes(len, newarr);
-		#elseif cs
-		var newarr = new cs.NativeArray(len);
-		cs.system.Array.Copy(b, pos, newarr, 0, len);
-		return new Bytes(len, newarr);
 		#elseif python
 		#elseif python
 		return new Bytes(len, python.Syntax.arrayAccess(b, pos, pos + len));
 		return new Bytes(len, python.Syntax.arrayAccess(b, pos, pos + len));
 		#else
 		#else
 		return new Bytes(len, b.slice(pos, pos + len));
 		return new Bytes(len, b.slice(pos, pos + len));
 		#end
 		#end
 	}
 	}
-	
+
 	/**
 	/**
 		Returns `0` if the bytes of `this` instance and the bytes of `other` are
 		Returns `0` if the bytes of `this` instance and the bytes of `other` are
 		identical.
 		identical.
@@ -220,7 +212,6 @@ class Bytes {
 		b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		b1.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		b2.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		return length - other.length;
 		return length - other.length;
-		// #elseif cs
 		// TODO: memcmp if unsafe flag is on
 		// TODO: memcmp if unsafe flag is on
 		#elseif cpp
 		#elseif cpp
 		return b.memcmp(other.b);
 		return b.memcmp(other.b);
@@ -428,13 +419,6 @@ class Bytes {
 		var result:String = "";
 		var result:String = "";
 		untyped __global__.__hxcpp_string_of_bytes(b, result, pos, len);
 		untyped __global__.__hxcpp_string_of_bytes(b, result, pos, len);
 		return result;
 		return result;
-		#elseif cs
-		switch (encoding) {
-			case UTF8 | null:
-				return cs.system.text.Encoding.UTF8.GetString(b, pos, len);
-			case RawNative:
-				return cs.system.text.Encoding.Unicode.GetString(b, pos, len);
-		}
 		#elseif java
 		#elseif java
 		try {
 		try {
 			switch (encoding) {
 			switch (encoding) {
@@ -505,8 +489,6 @@ class Bytes {
 		#elseif flash
 		#elseif flash
 		b.position = 0;
 		b.position = 0;
 		return b.toString();
 		return b.toString();
-		#elseif cs
-		return cs.system.text.Encoding.UTF8.GetString(b, 0, length);
 		#elseif java
 		#elseif java
 		try {
 		try {
 			return new String(b, 0, length, "UTF-8");
 			return new String(b, 0, length, "UTF-8");
@@ -558,8 +540,6 @@ class Bytes {
 		if (length > 0)
 		if (length > 0)
 			cpp.NativeArray.setSize(a, length);
 			cpp.NativeArray.setSize(a, length);
 		return new Bytes(length, a);
 		return new Bytes(length, a);
-		#elseif cs
-		return new Bytes(length, new cs.NativeArray(length));
 		#elseif java
 		#elseif java
 		return new Bytes(length, new java.NativeArray(length));
 		return new Bytes(length, new java.NativeArray(length));
 		#elseif python
 		#elseif python
@@ -591,14 +571,6 @@ class Bytes {
 		var a = new BytesData();
 		var a = new BytesData();
 		untyped __global__.__hxcpp_bytes_of_string(a, s);
 		untyped __global__.__hxcpp_bytes_of_string(a, s);
 		return new Bytes(a.length, a);
 		return new Bytes(a.length, a);
-		#elseif cs
-		var b = switch (encoding) {
-			case UTF8 | null:
-				cs.system.text.Encoding.UTF8.GetBytes(s);
-			case RawNative:
-				cs.system.text.Encoding.Unicode.GetBytes(s);
-		};
-		return new Bytes(b.Length, b);
 		#elseif java
 		#elseif java
 		try {
 		try {
 			var b:BytesData = switch (encoding) {
 			var b:BytesData = switch (encoding) {
@@ -658,8 +630,6 @@ class Bytes {
 		return new Bytes(b.length, b);
 		return new Bytes(b.length, b);
 		#elseif neko
 		#elseif neko
 		return new Bytes(untyped __dollar__ssize(b), b);
 		return new Bytes(untyped __dollar__ssize(b), b);
-		#elseif cs
-		return new Bytes(b.Length, b);
 		#else
 		#else
 		return new Bytes(b.length, b);
 		return new Bytes(b.length, b);
 		#end
 		#end

+ 0 - 15
std/haxe/io/BytesBuffer.hx

@@ -29,8 +29,6 @@ class BytesBuffer {
 	var b:flash.utils.ByteArray;
 	var b:flash.utils.ByteArray;
 	#elseif cpp
 	#elseif cpp
 	var b:BytesData;
 	var b:BytesData;
-	#elseif cs
-	var b:cs.system.io.MemoryStream;
 	#elseif java
 	#elseif java
 	var b:java.io.ByteArrayOutputStream;
 	var b:java.io.ByteArrayOutputStream;
 	#elseif python
 	#elseif python
@@ -50,8 +48,6 @@ class BytesBuffer {
 		b.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		b.endian = flash.utils.Endian.LITTLE_ENDIAN;
 		#elseif cpp
 		#elseif cpp
 		b = new BytesData();
 		b = new BytesData();
-		#elseif cs
-		b = new cs.system.io.MemoryStream();
 		#elseif java
 		#elseif java
 		b = new java.io.ByteArrayOutputStream();
 		b = new java.io.ByteArrayOutputStream();
 		#elseif python
 		#elseif python
@@ -66,8 +62,6 @@ class BytesBuffer {
 		if (@:privateAccess StringBuf.__get_length != null)
 		if (@:privateAccess StringBuf.__get_length != null)
 			return untyped StringBuf.__get_length(b);
 			return untyped StringBuf.__get_length(b);
 		return untyped __dollar__ssize(StringBuf.__to_string(b));
 		return untyped __dollar__ssize(StringBuf.__to_string(b));
-		#elseif cs
-		return haxe.Int64.toInt(b.Length);
 		#elseif java
 		#elseif java
 		return b.size();
 		return b.size();
 		#else
 		#else
@@ -82,8 +76,6 @@ class BytesBuffer {
 		b.writeByte(byte);
 		b.writeByte(byte);
 		#elseif cpp
 		#elseif cpp
 		b.push(untyped byte);
 		b.push(untyped byte);
-		#elseif cs
-		b.WriteByte(cast byte);
 		#elseif java
 		#elseif java
 		b.write(byte);
 		b.write(byte);
 		#elseif python
 		#elseif python
@@ -98,8 +90,6 @@ class BytesBuffer {
 		untyped StringBuf.__add(b, src.getData());
 		untyped StringBuf.__add(b, src.getData());
 		#elseif flash
 		#elseif flash
 		b.writeBytes(src.getData());
 		b.writeBytes(src.getData());
-		#elseif cs
-		b.Write(src.getData(), 0, src.length);
 		#elseif java
 		#elseif java
 		b.write(src.getData(), 0, src.length);
 		b.write(src.getData(), 0, src.length);
 		#elseif js
 		#elseif js
@@ -177,8 +167,6 @@ class BytesBuffer {
 		#elseif flash
 		#elseif flash
 		if (len > 0)
 		if (len > 0)
 			b.writeBytes(src.getData(), pos, len);
 			b.writeBytes(src.getData(), pos, len);
-		#elseif cs
-		b.Write(src.getData(), pos, len);
 		#elseif java
 		#elseif java
 		b.write(src.getData(), pos, len);
 		b.write(src.getData(), pos, len);
 		#elseif js
 		#elseif js
@@ -208,9 +196,6 @@ class BytesBuffer {
 			#elseif flash
 			#elseif flash
 			var bytes = new Bytes(b.length, b);
 			var bytes = new Bytes(b.length, b);
 			b.position = 0;
 			b.position = 0;
-			#elseif cs
-			var buf = b.GetBuffer();
-			var bytes = new Bytes(cast b.Length, buf);
 			#elseif java
 			#elseif java
 			var buf = b.toByteArray();
 			var buf = b.toByteArray();
 			var bytes = new Bytes(buf.length, buf);
 			var bytes = new Bytes(buf.length, buf);

+ 0 - 2
std/haxe/io/BytesData.hx

@@ -30,8 +30,6 @@ typedef BytesData = flash.utils.ByteArray;
 typedef BytesData = Array<cpp.UInt8>;
 typedef BytesData = Array<cpp.UInt8>;
 #elseif java
 #elseif java
 typedef BytesData = java.NativeArray<java.StdTypes.Int8>;
 typedef BytesData = java.NativeArray<java.StdTypes.Int8>;
-#elseif cs
-typedef BytesData = cs.NativeArray<cs.StdTypes.UInt8>;
 #elseif python
 #elseif python
 typedef BytesData = python.Bytearray;
 typedef BytesData = python.Bytearray;
 #elseif js
 #elseif js

+ 0 - 9
std/haxe/io/BytesInput.hx

@@ -138,15 +138,6 @@ class BytesInput extends Input {
 		java.lang.System.arraycopy(this.b, this.pos, buf.getData(), pos, len);
 		java.lang.System.arraycopy(this.b, this.pos, buf.getData(), pos, len);
 		this.pos += len;
 		this.pos += len;
 		this.len -= len;
 		this.len -= len;
-		#elseif cs
-		var avail:Int = this.len;
-		if (len > avail)
-			len = avail;
-		if (len == 0)
-			throw new Eof();
-		cs.system.Array.Copy(this.b, this.pos, buf.getData(), pos, len);
-		this.pos += len;
-		this.len -= len;
 		#else
 		#else
 		if (this.len == 0 && len > 0)
 		if (this.len == 0 && len > 0)
 			throw new Eof();
 			throw new Eof();

+ 2 - 70
std/haxe/io/FPHelper.hx

@@ -31,7 +31,7 @@ class FPHelper {
 	// stored in helper
 	// stored in helper
 	#elseif neko
 	#elseif neko
 	static var i64tmp = new sys.thread.Tls<Int64>();
 	static var i64tmp = new sys.thread.Tls<Int64>();
-	#elseif !(java || cs || cpp)
+	#elseif !(java || cpp)
 	static var i64tmp = Int64.ofInt(0);
 	static var i64tmp = Int64.ofInt(0);
 
 
 	static inline var LN2 = 0.6931471805599453; // Math.log(2)
 	static inline var LN2 = 0.6931471805599453; // Math.log(2)
@@ -95,7 +95,7 @@ class FPHelper {
 					av = av / Math.pow(2, exp) - 1.0;
 					av = av / Math.pow(2, exp) - 1.0;
 				}
 				}
 				var sig = Math.fround(av * 4503599627370496.); // 2^52
 				var sig = Math.fround(av * 4503599627370496.); // 2^52
-				// Note: If "sig" is outside of the signed Int32 range, the result is unspecified in HL, C#, Java and Neko,
+				// Note: If "sig" is outside of the signed Int32 range, the result is unspecified in HL, Java and Neko.
 				var sig_l = Std.int(sig);
 				var sig_l = Std.int(sig);
 				var sig_h = Std.int(sig / 4294967296.0);
 				var sig_h = Std.int(sig / 4294967296.0);
 				i64.set_low(sig_l);
 				i64.set_low(sig_l);
@@ -146,15 +146,6 @@ class FPHelper {
 		#end
 		#end
 		#elseif cpp
 		#elseif cpp
 		return untyped __global__.__hxcpp_reinterpret_le_int32_as_float32(i);
 		return untyped __global__.__hxcpp_reinterpret_le_int32_as_float32(i);
-		#elseif cs
-		var helper = new SingleHelper(0);
-		if (cs.system.BitConverter.IsLittleEndian) {
-			helper.i = i;
-		} else {
-			helper.i = ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
-		}
-
-		return helper.f;
 		#elseif java
 		#elseif java
 		return java.lang.Float.FloatClass.intBitsToFloat(i);
 		return java.lang.Float.FloatClass.intBitsToFloat(i);
 		#elseif flash
 		#elseif flash
@@ -184,14 +175,6 @@ class FPHelper {
 		#end
 		#end
 		#elseif cpp
 		#elseif cpp
 		return untyped __global__.__hxcpp_reinterpret_float32_as_le_int32(f);
 		return untyped __global__.__hxcpp_reinterpret_float32_as_le_int32(f);
-		#elseif cs
-		var helper = new SingleHelper(f);
-		if (cs.system.BitConverter.IsLittleEndian) {
-			return helper.i;
-		} else {
-			var i = helper.i;
-			return ((i >>> 24) & 0xFF) | (((i >> 16) & 0xFF) << 8) | (((i >> 8) & 0xFF) << 16) | ((i & 0xFF) << 24);
-		}
 		#elseif java
 		#elseif java
 		return java.lang.Float.FloatClass.floatToRawIntBits(f);
 		return java.lang.Float.FloatClass.floatToRawIntBits(f);
 		#elseif flash
 		#elseif flash
@@ -231,17 +214,6 @@ class FPHelper {
 		#end
 		#end
 		#elseif cpp
 		#elseif cpp
 		return untyped __global__.__hxcpp_reinterpret_le_int32s_as_float64(low, high);
 		return untyped __global__.__hxcpp_reinterpret_le_int32s_as_float64(low, high);
-		#elseif cs
-		var helper = new FloatHelper(0);
-		if (cs.system.BitConverter.IsLittleEndian) {
-			helper.i = haxe.Int64.make(high, low);
-		} else {
-			var i1 = high, i2 = low;
-			var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
-			var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
-			helper.i = haxe.Int64.make(j1, j2);
-		}
-		return helper.f;
 		#elseif java
 		#elseif java
 		return java.lang.Double.DoubleClass.longBitsToDouble(Int64.make(high, low));
 		return java.lang.Double.DoubleClass.longBitsToDouble(Int64.make(high, low));
 		#elseif flash
 		#elseif flash
@@ -296,18 +268,6 @@ class FPHelper {
 			untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_low(v));
 			untyped __global__.__hxcpp_reinterpret_float64_as_le_int32_low(v));
 		#elseif java
 		#elseif java
 		return java.lang.Double.DoubleClass.doubleToRawLongBits(v);
 		return java.lang.Double.DoubleClass.doubleToRawLongBits(v);
-		#elseif cs
-		var helper = new FloatHelper(v);
-		if (cs.system.BitConverter.IsLittleEndian) {
-			return helper.i;
-		} else {
-			var i = helper.i;
-			var i1 = haxe.Int64.getHigh(i), i2 = haxe.Int64.getLow(i);
-			var j2 = ((i1 >>> 24) & 0xFF) | (((i1 >> 16) & 0xFF) << 8) | (((i1 >> 8) & 0xFF) << 16) | ((i1 & 0xFF) << 24);
-			var j1 = ((i2 >>> 24) & 0xFF) | (((i2 >> 16) & 0xFF) << 8) | (((i2 >> 8) & 0xFF) << 16) | ((i2 & 0xFF) << 24);
-
-			return haxe.Int64.make(j1, j2);
-		}
 		#elseif flash
 		#elseif flash
 		var helper = helper;
 		var helper = helper;
 		helper.position = 0;
 		helper.position = 0;
@@ -332,31 +292,3 @@ class FPHelper {
 		#end
 		#end
 	}
 	}
 }
 }
-
-#if cs
-@:meta(System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit))
-@:nativeGen @:struct private class SingleHelper {
-	@:meta(System.Runtime.InteropServices.FieldOffset(0))
-	public var i:Int;
-	@:meta(System.Runtime.InteropServices.FieldOffset(0))
-	public var f:Single;
-
-	public function new(f:Single) {
-		this.i = 0;
-		this.f = f;
-	}
-}
-
-@:meta(System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Explicit))
-@:nativeGen @:struct private class FloatHelper {
-	@:meta(System.Runtime.InteropServices.FieldOffset(0))
-	public var i:haxe.Int64;
-	@:meta(System.Runtime.InteropServices.FieldOffset(0))
-	public var f:Float;
-
-	public function new(f:Float) {
-		this.i = haxe.Int64.ofInt(0);
-		this.f = f;
-	}
-}
-#end

+ 1 - 3
std/haxe/io/Input.hx

@@ -37,9 +37,7 @@ class Input {
 	**/
 	**/
 	public var bigEndian(default, set):Bool;
 	public var bigEndian(default, set):Bool;
 
 
-	#if cs
-	private var helper:BytesData;
-	#elseif java
+	#if java
 	private var helper:java.nio.ByteBuffer;
 	private var helper:java.nio.ByteBuffer;
 	#end
 	#end
 
 

+ 0 - 1
std/haxe/macro/Compiler.hx

@@ -751,7 +751,6 @@ enum Platform {
 	Flash;
 	Flash;
 	Php;
 	Php;
 	Cpp;
 	Cpp;
-	Cs;
 	Java;
 	Java;
 	Python;
 	Python;
 	Hl;
 	Hl;

+ 1 - 3
std/haxe/rtti/Meta.hx

@@ -46,8 +46,6 @@ class Meta {
 	private static function isInterface(t:Dynamic):Bool {
 	private static function isInterface(t:Dynamic):Bool {
 		#if java
 		#if java
 		return java.Lib.toNativeType(t).isInterface();
 		return java.Lib.toNativeType(t).isInterface();
-		#elseif cs
-		return cs.Lib.toNativeType(t).IsInterface;
 		#else
 		#else
 		throw "Something went wrong";
 		throw "Something went wrong";
 		#end
 		#end
@@ -56,7 +54,7 @@ class Meta {
 	private static function getMeta(t:Dynamic):MetaObject {
 	private static function getMeta(t:Dynamic):MetaObject {
 		#if php
 		#if php
 		return php.Boot.getMeta(t.phpClassName);
 		return php.Boot.getMeta(t.phpClassName);
-		#elseif (java || cs)
+		#elseif java
 		var ret = Reflect.field(t, "__meta__");
 		var ret = Reflect.field(t, "__meta__");
 		if (ret == null && Std.isOfType(t, Class)) {
 		if (ret == null && Std.isOfType(t, Class)) {
 			if (isInterface(t)) {
 			if (isInterface(t)) {

+ 0 - 18
tests/sys/compile-cs.hxml

@@ -1,18 +0,0 @@
-compile-each.hxml
---main Main
--cs bin/cs
-
---next
-compile-each.hxml
---main TestArguments
--cs bin/cs
-
---next
-compile-each.hxml
---main ExitCode
--cs bin/cs
-
---next
-compile-each.hxml
---main UtilityProcess
--cs bin/cs

+ 0 - 18
tests/sys/compile-java.hxml

@@ -1,18 +0,0 @@
-compile-each.hxml
---main Main
--java bin/java
-
---next
-compile-each.hxml
---main TestArguments
--java bin/java
-
---next
-compile-each.hxml
---main ExitCode
--java bin/java
-
---next
-compile-each.hxml
---main UtilityProcess
--java bin/java

+ 1 - 2
tests/sys/compile.hxml

@@ -4,8 +4,7 @@
 --next compile-neko.hxml
 --next compile-neko.hxml
 --next compile-python.hxml
 --next compile-python.hxml
 --next compile-cpp.hxml
 --next compile-cpp.hxml
---next compile-cs.hxml
---next compile-java.hxml
+--next compile-jvm.hxml
 --next compile-php.hxml
 --next compile-php.hxml
 --next compile-hl.hxml
 --next compile-hl.hxml
 --next compile-js.hxml
 --next compile-js.hxml

+ 0 - 2
tests/sys/gen_test_res.py

@@ -79,8 +79,6 @@ for data in all_filenames:
     for target, name in [
     for target, name in [
         ("../../bin/cpp/UtilityProcess-debug", "bin-cpp-debug"),
         ("../../bin/cpp/UtilityProcess-debug", "bin-cpp-debug"),
         ("../../bin/cpp/UtilityProcess", "bin-cpp"),
         ("../../bin/cpp/UtilityProcess", "bin-cpp"),
-        ("../../bin/cs/bin/UtilityProcess-Debug.exe", "bin-cs-debug"),
-        ("../../bin/cs/bin/UtilityProcess.exe", "bin-cs"),
         ("../../bin/hl/UtilityProcess.hl", "bin-hl"),
         ("../../bin/hl/UtilityProcess.hl", "bin-hl"),
         ("../../bin/hlc/utilityProcess/UtilityProcess.exe", "bin-hlc"),
         ("../../bin/hlc/utilityProcess/UtilityProcess.exe", "bin-hlc"),
         ("../../bin/lua/UtilityProcess.lua", "bin-lua"),
         ("../../bin/lua/UtilityProcess.lua", "bin-lua"),

+ 0 - 2
tests/sys/run.hxml

@@ -13,7 +13,6 @@ compile.hxml
 --cmd echo Neko   && export EXISTS=1 && neko bin/neko/sys.n
 --cmd echo Neko   && export EXISTS=1 && neko bin/neko/sys.n
 --cmd echo Python && export EXISTS=1 && python3 bin/python/sys.py
 --cmd echo Python && export EXISTS=1 && python3 bin/python/sys.py
 --cmd echo Cpp    && export EXISTS=1 && bin/cpp/Main-debug
 --cmd echo Cpp    && export EXISTS=1 && bin/cpp/Main-debug
---cmd echo CS     && export EXISTS=1 && mono bin/cs/bin/Main-Debug.exe
 --cmd echo Java   && export EXISTS=1 && java -jar bin/java/Main-Debug.jar
 --cmd echo Java   && export EXISTS=1 && java -jar bin/java/Main-Debug.jar
 --cmd echo Php    && export EXISTS=1 && php bin/php/Main/index.php
 --cmd echo Php    && export EXISTS=1 && php bin/php/Main/index.php
 --cmd echo Hl     && export EXISTS=1 && hl bin/hl/sys.hl
 --cmd echo Hl     && export EXISTS=1 && hl bin/hl/sys.hl
@@ -26,7 +25,6 @@ compile.hxml
 # --cmd echo Neko   && set EXISTS=1 && neko bin\neko\sys.n
 # --cmd echo Neko   && set EXISTS=1 && neko bin\neko\sys.n
 # --cmd echo Python && set EXISTS=1 && python3 bin\python\sys.py
 # --cmd echo Python && set EXISTS=1 && python3 bin\python\sys.py
 # --cmd echo Cpp    && set EXISTS=1 && bin\cpp\Main-debug.exe
 # --cmd echo Cpp    && set EXISTS=1 && bin\cpp\Main-debug.exe
-# --cmd echo CS     && set EXISTS=1 && bin\cs\bin\Main-Debug.exe
 # --cmd echo Java   && set EXISTS=1 && java -jar bin\java\Main-Debug.jar
 # --cmd echo Java   && set EXISTS=1 && java -jar bin\java\Main-Debug.jar
 # --cmd echo Php    && set EXISTS=1 && php -c ..\PHP.ini bin\php\Main\index.php
 # --cmd echo Php    && set EXISTS=1 && php -c ..\PHP.ini bin\php\Main\index.php
 # --cmd echo Hl     && set EXISTS=1 && hl bin/hl/sys.hl
 # --cmd echo Hl     && set EXISTS=1 && hl bin/hl/sys.hl

+ 2 - 2
tests/unit/src/unitstd/StringTools.unit.hx

@@ -142,7 +142,7 @@ StringTools.isEof(StringTools.fastCodeAt("", 0)) == true;
 // isEOF
 // isEOF
 #if (neko || lua || eval)
 #if (neko || lua || eval)
 StringTools.isEof(null) == true;
 StringTools.isEof(null) == true;
-#elseif (cs || java || python)
+#elseif (java || python)
 StringTools.isEof( -1) == true;
 StringTools.isEof( -1) == true;
 #elseif js
 #elseif js
 // how do I test this here?
 // how do I test this here?
@@ -165,4 +165,4 @@ aeq(expectedCodes, [for(c in StringTools.iterator(s)) c]);
 // keyValueIterator()
 // keyValueIterator()
 var keyCodes = [for(i => c in StringTools.keyValueIterator(s)) [i, c]];
 var keyCodes = [for(i => c in StringTools.keyValueIterator(s)) [i, c]];
 aeq(expectedKeys, keyCodes.map(a -> a[0]));
 aeq(expectedKeys, keyCodes.map(a -> a[0]));
-aeq(expectedCodes, keyCodes.map(a -> a[1]));
+aeq(expectedCodes, keyCodes.map(a -> a[1]));

+ 1 - 1
tests/unit/src/unitstd/haxe/zip/Compress.unit.hx

@@ -1,4 +1,4 @@
-// not supported in js/python/cs yet
+// not supported in js/python yet
 #if (cpp || php || java || neko || flash || hl)
 #if (cpp || php || java || neko || flash || hl)
 var b = haxe.io.Bytes.ofString("test");
 var b = haxe.io.Bytes.ofString("test");
 var c = haxe.zip.Compress.run(b, 9);
 var c = haxe.zip.Compress.run(b, 9);

+ 2 - 2
tests/unit/src/unitstd/haxe/zip/Uncompress.unit.hx

@@ -1,4 +1,4 @@
-// not supported in js/python/cs yet
+// not supported in js/python yet
 #if (cpp || php || java || neko || flash)
 #if (cpp || php || java || neko || flash)
 var d = [120, 218, 43, 73, 45, 46, 1, 0, 4, 93, 1, 193];
 var d = [120, 218, 43, 73, 45, 46, 1, 0, 4, 93, 1, 193];
 var b = haxe.io.Bytes.alloc(d.length);
 var b = haxe.io.Bytes.alloc(d.length);
@@ -29,4 +29,4 @@ r.write == 4;
 c.toString() == "test";
 c.toString() == "test";
 #else
 #else
 1 == 1;
 1 == 1;
-#end
+#end