瀏覽代碼

[flash] use String.replace (available since Flash 9) for StringTools.replace and use StringTools.replace in Type.getClassName

Dan Korostelev 5 年之前
父節點
當前提交
f72983c005
共有 2 個文件被更改,包括 7 次插入10 次删除
  1. 2 0
      std/StringTools.hx
  2. 5 10
      std/flash/_std/Type.hx

+ 2 - 0
std/StringTools.hx

@@ -430,6 +430,8 @@ class StringTools {
 			return s.split(sub).join(by);
 			return s.split(sub).join(by);
 		else
 		else
 			return untyped s.Replace(sub, by);
 			return untyped s.Replace(sub, by);
+		#elseif flash
+		return (cast s).replace(sub, by);
 		#else
 		#else
 		return s.split(sub).join(by);
 		return s.split(sub).join(by);
 		#end
 		#end

+ 5 - 10
std/flash/_std/Type.hx

@@ -71,17 +71,12 @@ enum ValueType {
 		if (c == null)
 		if (c == null)
 			return null;
 			return null;
 		var str:String = untyped __global__["flash.utils.getQualifiedClassName"](c);
 		var str:String = untyped __global__["flash.utils.getQualifiedClassName"](c);
-		switch (str) {
-			case "int":
-				return "Int";
-			case "Number":
-				return "Float";
-			case "Boolean":
-				return "Bool";
-			default:
+		return switch (str) {
+			case "int": "Int";
+			case "Number": "Float";
+			case "Boolean": "Bool";
+			case _: StringTools.replace(str, "::", ".");
 		}
 		}
-		var parts = str.split("::");
-		return parts.join(".");
 	}
 	}
 
 
 	public static function getEnumName(e:Enum<Dynamic>):String {
 	public static function getEnumName(e:Enum<Dynamic>):String {