瀏覽代碼

remove old resolveClass/getClassName specs for core abstracts

Dan Korostelev 8 年之前
父節點
當前提交
acb47bfa7c
共有 2 個文件被更改,包括 7 次插入24 次删除
  1. 6 22
      std/js/_std/Std.hx
  2. 1 2
      tests/unit/src/unit/TestReflect.hx

+ 6 - 22
std/js/_std/Std.hx

@@ -69,28 +69,12 @@ import js.Boot;
 			__feature__("js.Boot.getClass",__js__('Date').prototype.__class__ = __feature__("Type.resolveClass",$hxClasses["Date"] = __js__('Date'),__js__('Date')));
 			__feature__("js.Boot.isClass",__js__('Date').__name__ = ["Date"]);
 		});
-		__feature__("Int.*",{
-			var Int = __feature__("Type.resolveClass", $hxClasses["Int"] = { __name__ : ["Int"] }, { __name__ : ["Int"] });
-		});
-		__feature__("Dynamic.*",{
-			var Dynamic = __feature__("Type.resolveClass", $hxClasses["Dynamic"] = { __name__ : ["Dynamic"] }, { __name__ : ["Dynamic"] });
-		});
-		__feature__("Float.*",{
-			var Float = __feature__("Type.resolveClass", $hxClasses["Float"] = __js__("Number"), __js__("Number"));
-			Float.__name__ = ["Float"];
-		});
-		__feature__("Bool.*",{
-			var Bool = __js__("Boolean");
-		});
-		__feature__("Class.*",{
-			var Class = __feature__("Type.resolveClass", $hxClasses["Class"] = { __name__ : ["Class"] }, { __name__ : ["Class"] });
-		});
-		__feature__("Enum.*",{
-			var Enum = {};
-		});
-		__feature__("Void.*",{
-			var Void = __feature__("Type.resolveEnum", $hxClasses["Void"] = { __ename__ : ["Void"] }, { __ename__ : ["Void"] });
-		});
+		__feature__("Int.*",var Int = {});
+		__feature__("Dynamic.*",var Dynamic = {});
+		__feature__("Float.*",var Float = __js__("Number"));
+		__feature__("Bool.*",var Bool = __js__("Boolean"));
+		__feature__("Class.*",var Class = {});
+		__feature__("Enum.*",var Enum = {});
 
 #if (js_es < 5)
 		__feature__("Array.map",

+ 1 - 2
tests/unit/src/unit/TestReflect.hx

@@ -97,7 +97,7 @@ class TestReflect extends Test {
 			var name = TNAMES[i];
 			infos("type "+name);
 			f( t == null );
-			if( name == u("Enum") || name == u("Bool") ) {
+			if( name == u("Enum") || name == u("Bool") || name == u("Int") || name == u("Float") || name == u("Class") || name == u("Dynamic") ) {
 				// neither an enum or a class
 			} else if( t == MyEnum ) {
 				eq( Type.getEnumName(t), name );
@@ -144,7 +144,6 @@ class TestReflect extends Test {
 		is(function() { },null);
 		is(MyClass,Class);
 		is(MyEnum,Enum);
-		is(Class,Class);
 	}
 
 	function is( v : Dynamic, t1 : Dynamic, ?t2 : Dynamic, ?pos : haxe.PosInfos ){