Bladeren bron

[flash] change flash.utils.Object into a coreType abstract

Since it's also @:runtimeValue, we can actually reference Object, which is needed for interop sometimes
Dan Korostelev 6 jaren geleden
bovenliggende
commit
fa57afc807
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 2
      src/generators/genswf9.ml
  2. 2 1
      std/flash/utils/Object.hx

+ 1 - 2
src/generators/genswf9.ml

@@ -200,7 +200,6 @@ let rec follow_basic t =
 		| TAbstract ({ a_path = ([],"Bool") },[])
 		| TInst ({ cl_path = (["haxe"],"Int32") },[]) -> t
 		| t -> t)
-	| TType ({ t_path = ["flash";"utils"],"Object" },[])
 	| TType ({ t_path = ["flash";"utils"],"Function" },[])
 	| TType ({ t_path = [],"UInt" },[]) ->
 		t
@@ -280,7 +279,7 @@ let classify ctx t =
 		(match !(a.a_status) with
 		| Statics _ -> KNone
 		| _ -> KDynamic)
-	| TType ({ t_path = ["flash";"utils"],"Object" },[]) ->
+	| TAbstract ({ a_path = ["flash";"utils"],"Object" },[]) ->
 		KType (HMPath ([],"Object"))
 	| TInst _ | TAbstract _ ->
 		KType (type_id ctx t)

+ 2 - 1
std/flash/utils/Object.hx

@@ -1,3 +1,4 @@
 package flash.utils;
 
-typedef Object = Dynamic
+@:coreType @:runtimeValue
+abstract Object from Dynamic to Dynamic {}