added Lazy types.

genswf8.ml

@@ -310,6 +310,7 @@ let best_eq t =
 	match follow t with
 	| TMono _
 	| TDynamic _
+	| TLazy _
 	| TInst ({ cl_path = ([],"String") },_) ->
 		AEqual
 	| TInst _
@@ -569,6 +570,7 @@ and gen_try_catch ctx retval e catchs =
 			| TEnum (e,_) -> Some (TEnumDecl e)
 			| TInst (c,_) -> Some (TClassDecl c)
 			| TFun _
+			| TLazy _
 			| TAnon _ ->
 				assert false
 			| TMono _

genxml.ml

@@ -49,6 +49,7 @@ let rec gen_type t =
 	| TFun (args,r) -> node "f" [] (List.map gen_type (args @ [r]))
 	| TAnon fields -> node "a" [] (pmap (fun f -> node f.cf_name [] [gen_type f.cf_type]) fields)
 	| TDynamic t2 -> node "d" [] (if t == t2 then [] else [gen_type t2])
+	| TLazy f -> gen_type (!f())
 
 let gen_constr e =
 	let doc = gen_doc_opt e.ef_doc in

std/neko/NekoArray__.hx

@@ -112,7 +112,7 @@ class NekoArray__<T> implements Array<T> {
 		}
 	}
 
-	public function join(delim) {
+	public function join(delim : String) {
 		var s = new StringBuf();
 		var it = iterator();
 		for i in it {

std/neko/NekoString__.hx

@@ -123,7 +123,7 @@ class NekoString__ implements String {
 		}
 	}
 
-	public function toString() {
+	public function toString() : String {
 		return this;
 	}
 

type.ml

@@ -26,6 +26,7 @@ type t =
 	| TFun of t list * t
 	| TAnon of (string, tclass_field) PMap.t
 	| TDynamic of t
+	| TLazy of (unit -> t) ref
 
 and tconstant =
 	| TInt of string
@@ -79,7 +80,7 @@ and texpr = {
 
 and tclass_field = {
 	cf_name : string;
-	cf_type : t;
+	mutable cf_type : t;
 	cf_public : bool;
 	cf_doc : Ast.documentation;
 	mutable cf_expr : texpr option;
@@ -167,6 +168,8 @@ let rec s_type ctx t =
 		"{" ^ String.concat "," fl ^ " }";
 	| TDynamic t2 ->
 		"Dynamic" ^ s_type_params ctx (if t == t2 then [] else [t2])
+	| TLazy f ->		
+		s_type ctx (!f())
 
 and s_type_params ctx = function
 	| [] -> ""
@@ -183,6 +186,8 @@ let rec follow t =
 		(match !r with
 		| Some t -> follow t
 		| _ -> t)
+	| TLazy f ->		
+		follow (!f())
 	| _ -> t
 
 let rec is_parent csup c =
@@ -206,6 +211,8 @@ let rec link e a b =
 				false
 			else
 				loop t2
+		| TLazy f ->
+			loop (!f())
 		| TAnon fl ->
 			try
 				PMap.iter (fun _ f -> if loop f.cf_type then raise Exit) fl;
@@ -257,6 +264,8 @@ let apply_params cparams params t =
 			TFun (List.map loop tl,loop r)
 		| TAnon fl ->
 			TAnon (PMap.map (fun f -> { f with cf_type = loop f.cf_type }) fl)
+		| TLazy f ->
+			loop (!f())
 		| TDynamic t2 ->
 			if t == t2 then
 				t
@@ -272,6 +281,8 @@ let rec type_eq param a b =
 	if a == b || (param && b == t_dynamic) then
 		true
 	else match a , b with
+	| TLazy f , _ -> type_eq param (!f()) b
+	| _ , TLazy f -> type_eq param a (!f())
 	| TMono t , _ -> (match !t with None -> link t a b | Some t -> type_eq param t b)
 	| _ , TMono t -> (match !t with None -> link t b a | Some t -> type_eq param a t)
 	| TEnum (a,tl1) , TEnum (b,tl2) -> a == b && List.for_all2 (type_eq param) tl1 tl2
@@ -280,6 +291,9 @@ let rec type_eq param a b =
 	| TFun (l1,r1) , TFun (l2,r2) when List.length l1 = List.length l2 ->
 		type_eq param r1 r2 && List.for_all2 (type_eq param) l1 l2
 	| _ , _ ->
+		let p = print_context() in
+		prerr_endline (s_type p a);
+		prerr_endline (s_type p b);
 		false
 
 (* perform unification with subtyping.
@@ -291,6 +305,8 @@ let rec unify a b =
 	if a == b then
 		true
 	else match a, b with
+	| TLazy f , _ -> unify (!f()) b
+	| _ , TLazy f -> unify a (!f())
 	| TMono t , _ -> (match !t with None -> link t a b | Some t -> unify t b)
 	| _ , TMono t -> (match !t with None -> link t b a | Some t -> unify a t)
 	| TEnum (a,tl1) , TEnum (b,tl2) -> a == b && List.for_all2 (type_eq true) tl1 tl2