Progress

src/compiler/hxb/hxbReader.ml

@@ -2,8 +2,10 @@ open Globals
 open Ast
 open Type
 open HxbData
+open TPrinting
 
 class hxb_reader
+	(com : Common.context)
 	(file_ch : IO.input)
 	(make_module : path -> string -> module_def)
 	(add_module : module_def -> unit)
@@ -22,6 +24,9 @@ class hxb_reader
 	(* val mutable abstract_fields = Array.make 0 null_abstract_field *)
 	(* val mutable enum_fields = Array.make 0 null_enum_field *)
 
+	val vars = Hashtbl.create 0
+	(* val mutable vars = Array.make 0 null_tvar *)
+	(* val mutable vars = Array.make 0 null_tvar *)
 	val mutable type_type_parameters = Array.make 0 (mk_type_param "" t_dynamic None)
 	val mutable field_type_parameters = Array.make 0 (mk_type_param "" t_dynamic None)
 
@@ -146,11 +151,14 @@ class hxb_reader
 		let file = self#read_string in
 		let min = self#read_leb128 in
 		let max = self#read_leb128 in
-		{
+		let pos = {
 			pfile = file;
 			pmin = min;
 			pmax = max;
-		}
+		} in
+		Printf.eprintf "Read pos: %s\n" (Printer.s_pos pos);
+		MessageReporting.display_source_at com pos;
+		pos
 
 	method read_metadata_entry : metadata_entry =
 		let name = self#read_string in
@@ -188,6 +196,8 @@ class hxb_reader
 		typedefs.(self#read_uleb128)
 
 	method read_field_ref =
+		let name = self#read_string in
+		Printf.eprintf "  TODO: resolve field %s...\n" name;
 		null_field (* TODO *)
 
 	method read_enum_field_ref =
@@ -206,18 +216,23 @@ class hxb_reader
 		| 1 ->
 			self#read_type_instance
 		| 5 ->
-			(field_type_parameters.(self#read_uleb128)).ttp_type
+			let i = self#read_uleb128 in
+			Printf.eprintf "     Get field type param %d\n" i;
+			(field_type_parameters.(i)).ttp_type
 		| 6 ->
 			(type_type_parameters.(self#read_uleb128)).ttp_type
 		| 10 ->
 			TInst(self#read_class_ref,[])
-		| 13 ->
-			TAbstract(self#read_abstract_ref,[])
-		| 11
+		| 11 ->
+			let i = self#read_uleb128 in
+			Printf.eprintf "  TODO enum ref #%d\n" i;
+			t_dynamic (* TODO *)
 		| 12 ->
-			ignore(self#read_uleb128);
-			Printf.eprintf "  TODO TType\n";
+			let i = self#read_uleb128 in
+			Printf.eprintf "  TODO typedef ref #%d\n" i;
 			t_dynamic (* TODO *)
+		| 13 ->
+			TAbstract(self#read_abstract_ref,[])
 		| 14 ->
 			let c = self#read_class_ref in
 			let tl = self#read_types in
@@ -255,15 +270,22 @@ class hxb_reader
 
 	method read_types =
 			(* TODO check list 8 vs 16 *)
-		self#read_list8 (fun () -> self#read_type_instance)
-		(* self#read_list16 (fun () -> self#read_type_instance) *)
+		(* self#read_list8 (fun () -> self#read_type_instance) *)
+		self#read_list16 (fun () -> self#read_type_instance)
 
 	(* Fields *)
 
 	method read_type_parameters (m : module_def) (path : path) (f : typed_type_param array -> unit) =
-		let a = Array.init (self#read_uleb128) (fun _ ->
+		let l = self#read_uleb128 in
+		let a = Array.init l (fun _ ->
+			(* Name / pos are wrong for field ttp *)
+			(* name is weird (some part of package?) and pos file is arg name somehow *)
 			let name = self#read_string in
 			let pos = self#read_pos in
+			Printf.eprintf "      Read ttp pos for %s: %s\n" name (Printer.s_pos pos);
+			Printf.eprintf "      - Path was %s\n" (s_type_path path);
+
+			(* This is wrong for field ttp *)
 			let c = mk_class m (fst path @ [snd path],name) pos pos in
 			mk_type_param name (TInst(c,[])) None
 		) in
@@ -323,121 +345,36 @@ class hxb_reader
 	(* 	let c = self#read_class true in *)
 	(* 	(name,TInst(c,[])) *)
 
-	method read_binop =
-		match IO.read_byte ch with
-			| 0 -> OpAdd
-			| 1 -> OpMult
-			| 2 -> OpDiv
-			| 3 -> OpSub
-			| 4 -> OpAssign
-			| 5 -> OpEq
-			| 6 -> OpNotEq
-			| 7 -> OpGt
-			| 8 -> OpGte
-			| 9 -> OpLt
-			| 10 -> OpLte
-			| 11 -> OpAnd
-			| 12 -> OpOr
-			| 13 -> OpXor
-			| 14 -> OpBoolAnd
-			| 15 -> OpBoolOr
-			| 16 -> OpShl
-			| 17 -> OpShr
-			| 18 -> OpUShr
-			| 19 -> OpMod
-			| 20 -> OpAssignOp(self#read_binop)
-			| 21 -> OpInterval
-			| 22 -> OpArrow
-			| 23 -> OpIn
-			| _ -> assert false
-
-	method read_unop =
-		match IO.read_byte ch with
-		| 0 -> Increment
-		| 1 -> Decrement
-		| 2 -> Not
-		| 3 -> Neg
-		| 4 -> NegBits
-		| _ -> assert false
+	(* method read_quote_status = *)
+	(* 	match IO.read_byte ch with *)
+	(* 	| 0 -> NoQuotes *)
+	(* 	| 1 -> DoubleQuotes *)
+	(* 	| _ -> assert false *)
 
-	method read_quote_status =
-		match IO.read_byte ch with
-		| 0 -> NoQuotes
-		| 1 -> DoubleQuotes
-		| _ -> assert false
-
-	method read_tconstant =
-		match IO.read_byte ch with
-		| 0 -> TBool(false)
-		| 1 -> TBool(true)
-		| 2 -> TNull
-		| 3 -> TThis
-		| 4 -> TSuper
-		| 5 -> TInt(IO.read_real_i32 ch)
-		| 6 -> TFloat(self#read_string)
-		| 7 -> TString(self#read_string)
-		| _ -> assert false
-
-	method read_tvar_def =
-		let read_tvar_extra =
-			(* TODO type parameters *)
-			(* list_8 *)
-			(* let params = self#read_list8 (fun () -> self#read_type_parameter) in *)
-			let params = [] in
-			let e = self#read_option (fun () -> self#read_texpr) in
-			{
-				v_params = params;
-				v_expr = e;
-			}
-		in
-		(* let i = self#read_lut in *)
-		let id = IO.read_i32 ch in
-		let name = self#read_string in
-		let t = self#read_type_instance in
-		(* let capture = self#read_bool in *)
-		let _ = self#read_bool in
-		let extra = self#read_option (fun () -> read_tvar_extra) in
-		(* list 8 *)
-		let meta = self#read_metadata in
-		let p = self#read_pos in
-		let v = {
-			v_id = id;
-			v_name = name;
-			v_type = t;
-			(* TODO *)
-			(* v_capture = capture; *)
-			v_kind = VGenerated; (* TODO *)
-			v_extra = extra;
-			(* TODO *)
-			v_flags = 0;
-			v_meta = meta;
-			v_pos = p;
-		} in
-		(* vars.(i) <- v; *)
-		v
+	(* method read_object_field_key = *)
+	(* 	let name = self#read_string in *)
+	(* 	let p = self#read_pos in *)
+	(* 	let quotes = self#read_quote_status in *)
+	(* 	(name,p,quotes) *)
 
-	method read_object_field_key =
-		let name = self#read_string in
-		let p = self#read_pos in
-		let quotes = self#read_quote_status in
-		(name,p,quotes)
-
-	method read_object_field =
-		let k = self#read_object_field_key in
-		let e = self#read_texpr in
-		(k,e)
+	(* method read_object_field = *)
+	(* 	Printf.eprintf "   read_object_field\n"; *)
+	(* 	let k = self#read_object_field_key in *)
+	(* 	let e = self#read_texpr in *)
+	(* 	(k,e) *)
 
 	method read_tfunction_arg =
-		let v = self#read_tvar_def in
+		Printf.eprintf "   read_tfunction_arg\n";
+		let v = self#read_var in
 		let cto = self#read_option (fun () -> self#read_texpr) in
-		(* let cto = self#read_option (fun () -> self#read_tconstant) in *)
 		(v,cto)
 
 	method read_tfunction =
-		(* list_8 *)
-		let args = self#read_list8 (fun () -> self#read_tfunction_arg) in
+		Printf.eprintf "   read_tfunction\n";
+		let args = self#read_list16 (fun () -> self#read_tfunction_arg) in
 		let r = self#read_type_instance in
 		let e = self#read_texpr in
+		Printf.eprintf "   read_tfunction done\n";
 		{
 			tf_args = args;
 			tf_type = r;
@@ -446,6 +383,7 @@ class hxb_reader
 
 	method read_switch_case =
 		(* list_8 *)
+		Printf.eprintf "   read_switch_case\n";
 		let el = self#read_list8 (fun () -> self#read_texpr) in
 		let e = self#read_texpr in
 		{
@@ -454,7 +392,8 @@ class hxb_reader
 		}
 
 	method read_catch =
-		let v = self#read_tvar_def in
+		Printf.eprintf "   read_catch\n";
+		let v = self#read_var in
 		let e = self#read_texpr in
 		(v,e)
 
@@ -483,492 +422,561 @@ class hxb_reader
 			FEnum(en,ef)
 		| _ -> assert false
 
+	method read_var_kind =
+		match IO.read_byte ch with
+			| 0 -> VUser TVOLocalVariable
+			| 1 -> VUser TVOArgument
+			| 2 -> VUser TVOForVariable
+			| 3 -> VUser TVOPatternVariable
+			| 4 -> VUser TVOCatchVariable
+			| 5 -> VUser TVOLocalFunction
+			| 6 -> VGenerated
+			| 7 -> VInlined
+			| 8 -> VInlinedConstructorVariable
+			| 9 -> VExtractorVariable
+			| 10 -> VAbstractThis
+			| _ -> assert false
+
+	method read_var =
+		let id = IO.read_i32 ch in
+		let name = self#read_string in
+		let t = self#read_type_instance in
+		let kind = self#read_var_kind in
+		(* TODO flags / extra *)
+		let meta = self#read_metadata in
+		let pos = self#read_pos in
+		let v = {
+			v_id = id;
+			v_name = name;
+			v_type = t;
+			v_kind = kind;
+			v_meta = meta;
+			v_pos = pos;
+			v_extra = None;
+			v_flags = 0;
+		} in
+		(* vars.(id) <- v; *)
+		Hashtbl.add vars id v;
+		(* vars.(id) <- v; *)
+		v
+
 	method read_texpr =
+		Printf.eprintf "   Read texpr\n";
+		let t = self#read_type_instance in
 		let pos = self#read_pos in
 
-		let update_pos =
-			let dmin = self#read_i16 in
-			let dmax = self#read_i16 in
+		let i = IO.read_byte ch in
+		Printf.eprintf "      -- loop [%d] --\n" i;
+		let e = match i with
+			(* values 0-19 *)
+			| 0 -> TConst TNull
+			| 1 -> TConst TThis
+			| 2 -> TConst TSuper
+			| 3 -> TConst (TBool false)
+			| 4 -> TConst (TBool true)
+			| 5 -> TConst (TInt (IO.read_real_i32 ch))
+			| 6 -> TConst (TFloat self#read_string)
+			| 7 -> TConst (TString self#read_string)
+
+			(* vars 20-29 *)
+			(* | 20 -> TLocal (vars.(IO.read_i32 ch)) *)
+			| 20 -> TLocal (Hashtbl.find vars (IO.read_i32 ch))
+			| 21 -> TVar (self#read_var,None)
+			| 22 ->
+					let v = self#read_var in
+					let e = self#read_texpr in
+					TVar (v, Some e)
+
+			(* blocks 30-49 *)
+			| 30 -> TBlock []
+			| 31 | 32 | 33 | 34 | 35 ->
+				(* TODO directly create list *)
+				let l = i - 30 in
+				let el = Array.init l (fun i -> begin
+					Printf.eprintf "    -- block expr %d of %d --\n" i (l-1);
+					self#read_texpr
+				end) in
+				TBlock (Array.to_list el);
+			(* TODO 36+ *)
+
+			(* function 50-59 *)
+			| 50 ->
+				let args = self#read_list16 (fun () -> begin
+					let v = self#read_var in
+					let e = self#read_option (fun () -> self#read_texpr) in
+					(v, e)
+				end) in
+				let t = self#read_type_instance in
+				let e = self#read_texpr in
+				TFunction { tf_args = args; tf_type = t; tf_expr = e; }
+				(* TFunction self#read_tfunction *)
+
+			(* texpr compounds 60-79 *)
+			| 60 ->
+				let e1 = self#read_texpr in
+				let e2 = self#read_texpr in
+				TArray (e1,e2)
+			(* TODO 61-63 *)
+			| 64 ->
+				let e1 = self#read_texpr in
+				let el = self#read_texpr_list in
+				TCall(e1,el)
+
+			(* branching 80-89 *)
+
+			(* control flow 90-99 *)
+			| 90 -> TReturn None
+			| 91 -> TReturn (Some self#read_texpr)
+			(* TODO 92-94 *)
+
+			(* access 100-119 *)
+			(* TODO 100 101 103-108 *)
+			| 102 ->
+				(* Printf.eprintf "      -- [%d] e1 --\n" i; *)
+				let e1 = self#read_texpr in
+				(* Printf.eprintf "      -- [%d] read e1 at: --\n" i; *)
+				(* MessageReporting.display_source_at com e1.epos; *)
+				(* Printf.eprintf "      -- [%d] c --\n" i; *)
+				let c = self#read_class_ref in
+				(* Printf.eprintf "      -- [%d] c.name = %s --\n" i (snd c.cl_path); *)
+				(* Printf.eprintf "      -- [%d] tl --\n" i; *)
+				let tl = self#read_types in
+				(* Printf.eprintf "      -- [%d] cf --\n" i; *)
+				let cf = self#read_field_ref in
+				(* Printf.eprintf "      -- [%d] cf.name = %s --\n" i cf.cf_name; *)
+				(* Printf.eprintf "      -- [%d] ready --\n" i; *)
+				TField(e1,FInstance(c,tl,cf))
+			| 103 ->
+				let e1 = self#read_texpr in
+				let c = self#read_class_ref in
+				let cf = self#read_field_ref in
+				TField(e1,FStatic(c,cf))
+			| 104 ->
+				let e1 = self#read_texpr in
+				(* TODO *)
+				e1.eexpr
+			| 108 ->
+				let e1 = self#read_texpr in
+				let s = self#read_string in
+				TField(e1,FDynamic s)
+
+			(* module types 120-139 *)
+			| 120 -> TTypeExpr (TClassDecl self#read_class_ref)
+			| 124 -> TCast(self#read_texpr,None)
+			| 126 ->
+				let c = self#read_class_ref in
+				Printf.eprintf "      -- [%d] c.name = %s --\n" i (snd c.cl_path);
+				let tl = self#read_types in
+				Printf.eprintf "      -- [%d] tl.len = %d --\n" i (List.length tl);
+				let el = self#read_texpr_list in
+				Printf.eprintf "      -- [%d] el.len = %d --\n" i (List.length el);
+				Printf.eprintf "      -- [%d] ready --\n" i;
+				TNew(c,tl,el)
+
+			(* unops 140-159 *)
+			| _ when i >= 140 && i < 160 ->
+				let get_unop i = match i with
+					| 0 -> Increment,Prefix
+					| 1 -> Decrement,Prefix
+					| 2 -> Not,Prefix
+					| 3 -> Neg,Prefix
+					| 4 -> NegBits,Prefix
+					| 5 -> Spread,Prefix
+					| 6 -> Increment,Prefix
+					| 7 -> Decrement,Prefix
+					| 8 -> Not,Prefix
+					| 9 -> Neg,Prefix
+					| 10 -> NegBits,Prefix
+					| 11 -> Spread,Prefix
+					| _ -> assert false
+				in
+
+				let (op,flag) = get_unop (i - 140) in
+				let e = self#read_texpr in
+				TUnop(op,flag,e)
+
+			(* binops 160-219 *)
+			| _ when i >= 160 && i < 220 ->
+				let rec get_binop i = match i with
+					| 0 -> OpAdd
+					| 1 -> OpMult
+					| 2 -> OpDiv
+					| 3 -> OpSub
+					| 4 -> OpAssign
+					| 5 -> OpEq
+					| 6 -> OpNotEq
+					| 7 -> OpGt
+					| 8 -> OpGte
+					| 9 -> OpLt
+					| 10 -> OpLte
+					| 11 -> OpAnd
+					| 12 -> OpOr
+					| 13 -> OpXor
+					| 14 -> OpBoolAnd
+					| 15 -> OpBoolOr
+					| 16 -> OpShl
+					| 17 -> OpShr
+					| 18 -> OpUShr
+					| 19 -> OpMod
+					| 20 -> OpInterval
+					| 21 -> OpArrow
+					| 22 -> OpIn
+					| 23 -> OpNullCoal
+					| _ -> OpAssignOp (get_binop (i - 30))
+				in
 
-			(* TODO return updated pos *)
-			ignore(dmin);
-			ignore(dmax);
-			pos
+				let op = get_binop (i - 160) in
+				Printf.eprintf "      -- [%d] e1 --\n" i;
+				let e1 = self#read_texpr in
+				Printf.eprintf "      -- [%d] read e1 at: --\n" i;
+				MessageReporting.display_source_at com e1.epos;
+				Printf.eprintf "      -- [%d] e2 --\n" i;
+				let e2 = self#read_texpr in
+				Printf.eprintf "      -- [%d] read e2 at: --\n" i;
+				MessageReporting.display_source_at com e2.epos;
+				Printf.eprintf "      -- [%d] binop ready --\n" i;
+				TBinop(op,e1,e2)
+
+			(* rest 250-254 *)
+			| 250 -> TIdent (self#read_string)
+
+			| i ->
+				Printf.eprintf "  [ERROR] Unhandled texpr %d at:\n" i;
+				MessageReporting.display_source_at com pos;
+				assert false
 		in
 
-		let loop () =
-		(* let rec loop () = *)
-			let t = self#read_type_instance in
-			let pos = update_pos in
-
-			let e = match IO.read_byte ch with
-				(* values 0-19 *)
-				| 0 -> TConst TNull
-				| 1 -> TConst TThis
-				| 2 -> TConst TSuper
-				| 3 -> TConst (TBool false)
-				| 4 -> TConst (TBool true)
-				| 5 -> TConst (TInt (IO.read_real_i32 ch))
-				| 6 -> TConst (TFloat self#read_string)
-				| 7 -> TConst (TString self#read_string)
-
-				(* vars 20-29 *)
-				(* TODO retrieve local by v_vid *)
-				(* | 20 -> TLocal (vars.self#read_lut)) *)
-				(* TODO read_var *)
-				(* | 21 -> TVar (self#read_var,None) *)
-				(* | 22 -> TVar (self#read_var, Some (loop ())) *)
-
-				(* blocks 30-49 *)
+		Printf.eprintf "   Done reading texpr at:\n";
+		MessageReporting.display_source_at com pos;
 
-				| i ->
-					Printf.eprintf "  [ERROR] Unhandled texpr %d\n" i;
-					assert false
-			in
+		{
+			eexpr = e;
+			etype = t;
+			epos = pos;
+		}
 
-			{
-				eexpr = e;
-				etype = t;
-				epos = pos;
-			}
-		in
+	method read_texpr_list =
+		let len = IO.read_ui16 ch in
+		List.init len (fun _ -> self#read_texpr);
 
-		loop ();
-
-			(* let e = match IO.read_byte ch with *)
-			(* 	| 0 -> TConst(self#read_tconstant) *)
-			(* 	| 1 -> assert false *)
-			(* 	(1* | 1 -> TLocal (vars.(self#read_lut)) (2* TODO *2) *1) *)
-			(* 	| 2 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TArray(e1,e2) *)
-			(* 	| 3 -> *)
-			(* 		let op = self#read_binop in *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TBinop(op,e1,e2) *)
-			(* 	| 4 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let fa = self#read_tfield_access in *)
-			(* 		TField(e1,fa) *)
-			(* 	| 5 -> TTypeExpr (TClassDecl (self#read_class_ref)) *)
-			(* 	| 6 -> TTypeExpr (TEnumDecl (self#read_enum_ref)) *)
-			(* 	| 7 -> TTypeExpr (TTypeDecl (self#read_typedef_ref)) *)
-			(* 	| 8 -> TTypeExpr (TAbstractDecl (self#read_abstract_ref)) *)
-			(* 	| 9 -> TParenthesis(self#read_texpr) *)
-			(* 	| 10 -> TObjectDecl(self#read_list8 (fun () -> self#read_object_field)) *)
-			(* 	| 11 -> TArrayDecl(self#read_list8 (fun () -> self#read_texpr)) *)
-			(* 	| 12 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let el = self#read_list8 (fun () -> self#read_texpr) in *)
-			(* 		TCall(e1,el) *)
-			(* 	| 13 -> *)
-			(* 		let c = self#read_class_ref in *)
-			(* 		let tl = self#read_types in *)
-			(* 		let el = self#read_list8 (fun () -> self#read_texpr) in *)
-			(* 		TNew(c,tl,el) *)
-			(* 	| 14 -> *)
-			(* 		let op = self#read_unop in *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		TUnop(op,Prefix,e1) *)
-			(* 	| 15 -> *)
-			(* 		let op = self#read_unop in *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		TUnop(op,Postfix,e1) *)
-			(* 	| 16 -> TFunction(self#read_tfunction) *)
-			(* 	| 17 -> *)
-			(* 		let v = self#read_tvar_def in *)
-			(* 		let eo = self#read_option (fun () -> self#read_texpr) in *)
-			(* 		TVar(v,eo) *)
-			(* 	(1* TODO check list 8 vs 16 *1) *)
-			(* 	| 18 -> TBlock(self#read_list16 (fun () -> self#read_texpr)) *)
-			(* 	| 19 -> *)
-			(* 		let v = self#read_tvar_def in *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TFor(v,e1,e2) *)
-			(* 	| 20 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TIf(e1,e2,None) *)
-			(* 	| 21 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		let e3 = self#read_texpr in *)
-			(* 		TIf(e1,e2,Some e3) *)
-			(* 	| 22 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TWhile(e1,e2,NormalWhile) *)
-			(* 	| 23 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let e2 = self#read_texpr in *)
-			(* 		TWhile(e1,e2,DoWhile) *)
-			(* 	| 24 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 	(1* TODO check list 8 vs 16 *1) *)
-			(* 		let cases = self#read_list16 (fun () -> self#read_switch_case) in *)
-			(* 		let eo = self#read_option (fun () -> self#read_texpr) in *)
-
-			(* 		TSwitch { *)
-			(* 			switch_subject = e1; *)
-			(* 			switch_cases = cases; *)
-			(* 			switch_default = eo; *)
-			(* 			switch_exhaustive = true; (1* I guess, if this was saved? *1) *)
-			(* 		} *)
-			(* 	| 25 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let catches = self#read_list8 (fun () -> self#read_catch) in *)
-			(* 		TTry(e1,catches) *)
-			(* 	| 26 -> TReturn None *)
-			(* 	| 27 -> TReturn (Some (self#read_texpr)) *)
-			(* 	| 28 -> TBreak *)
-			(* 	| 29 -> TContinue *)
-			(* 	| 30 -> TThrow (self#read_texpr) *)
-			(* 	| 31 -> TCast(self#read_texpr,None) *)
-			(* 	| 32 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let c = self#read_class_ref in *)
-			(* 		TCast(e1,Some (TClassDecl c)) *)
-			(* 	| 33 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let en = self#read_enum_ref in *)
-			(* 		TCast(e1,Some (TEnumDecl en)) *)
-			(* 	| 34 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let td = self#read_typedef_ref in *)
-			(* 		TCast(e1,Some (TTypeDecl td)) *)
-			(* 	| 35 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let a = self#read_abstract_ref in *)
-			(* 		TCast(e1,Some (TAbstractDecl a)) *)
-			(* 	| 36 -> *)
-			(* 		let m = self#read_metadata_entry in *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		TMeta(m,e1) *)
-			(* 	| 37 -> *)
-			(* 		let e1 = self#read_texpr in *)
-			(* 		let ef = self#read_enum_field_ref in *)
-			(* 		let i = IO.read_i32 ch in *)
-			(* 		TEnumParameter(e1,ef,i) *)
-			(* 	| 38 -> TEnumIndex(self#read_texpr) *)
-			(* 	| 39 -> TIdent(self#read_string) *)
-			(* 	| _ -> assert false *)
-			(* in *)
-
-		method read_class_field (m : module_def) : tclass_field =
-			let name = self#read_string in
-			Printf.eprintf "    Read class field %s\n" name;
-			(* TODO read_list? *)
-			(* self#read_type_parameters m ([],name) (fun a -> *)
-			(* 	field_type_parameters <- a *)
-			(* ); *)
+	method read_class_field (m : module_def) : tclass_field =
+		let name = self#read_string in
+		Printf.eprintf "    Read class field %s\n" name;
+		(* TODO fix fietd type param reading *)
+		self#read_type_parameters m ([],name) (fun a ->
+			Printf.eprintf "     Read field type param (len = %d)\n" (Array.length a);
+			field_type_parameters <- a
+		);
+		let params = Array.to_list field_type_parameters in
+		Printf.eprintf "    Done reading type params for class field %s\n" name;
+		let t = self#read_type_instance in
+		let flags = IO.read_i32 ch in
+		let pos = self#read_pos in
+		let name_pos = self#read_pos in
+
+		(* TODO fix doc *)
+		(* let doc = self#read_option (fun () -> self#read_documentation) in *)
+		let doc = None in
+
+		let meta = self#read_metadata in
+		let kind = self#read_field_kind in
+
+		Printf.eprintf "   Read class field expr\n";
+		let expr = self#read_option (fun () -> self#read_texpr) in
+		Printf.eprintf "   Read class field unoptimizedexpr\n";
+		let expr_unoptimized = self#read_option (fun () -> self#read_texpr) in
+		let overloads = self#read_list16 (fun () -> self#read_class_field m) in
+		{
+			cf_name = name;
+			cf_type = t;
+			cf_pos = pos;
+			cf_name_pos = name_pos;
+			cf_doc = doc;
+			cf_meta = meta;
+			cf_kind = kind;
+			cf_expr = expr;
+			cf_expr_unoptimized = expr_unoptimized;
+			cf_params = params;
+			cf_overloads = overloads;
+			cf_flags = flags;
+		}
+
+	method read_class_fields (m : module_def) (c : tclass) =
+		Printf.eprintf "  Read class fields for %s\n" (snd m.m_path);
+		let f () = self#read_class_field m in
+		begin match c.cl_kind with
+		| KAbstractImpl a ->
+			type_type_parameters <- Array.of_list a.a_params
+		| _ ->
+			type_type_parameters <- Array.of_list c.cl_params
+		end;
+		Printf.eprintf "  Read constructor for %s\n" (snd m.m_path);
+		c.cl_constructor <- self#read_option f;
+		Printf.eprintf "  Read ordered fields for %s\n" (snd m.m_path);
+			(* TODO check list 8 vs 16 *)
+		c.cl_ordered_fields <- self#read_list16 f;
+			(* TODO check list 8 vs 16 *)
+		Printf.eprintf "  Read ordered statics for %s\n" (snd m.m_path);
+		c.cl_ordered_statics <- self#read_list16 f;
+		List.iter (fun cf -> c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics) c.cl_ordered_statics;
+
+	(* Module types *)
+
+	method read_common_module_type (m : module_def) (infos : tinfos) =
+		infos.mt_private <- self#read_bool;
+		(* TODO: fix that *)
+		(* infos.mt_doc <- self#read_option (fun () -> self#read_documentation); *)
+		infos.mt_meta <- self#read_metadata;
+		(* TODO update to new type param format? *)
+		self#read_type_parameters m infos.mt_path (fun a ->
+			type_type_parameters <- a
+		);
+		infos.mt_params <- Array.to_list type_type_parameters;
+			(* TODO check list 8 vs 16 *)
+		infos.mt_using <- self#read_list16 (fun () ->
+			let c = self#read_class_ref in
+			let p = self#read_pos in
+			(c,p)
+		)
+
+	method read_class_kind = match self#read_u8 with
+		| 0 ->
+			KNormal
+		| 1 ->
+			KTypeParameter self#read_types
+		| 2 ->
+			KExpr ((EBlock []),null_pos) (* TODO *)
+		| 3 ->
+			KGeneric
+		| 4 ->
+			let c = self#read_class_ref in
+			let tl = self#read_types in
+			KGenericInstance(c,tl)
+		| 5 ->
+			KMacroType
+		| 6 ->
+			KGenericBuild [] (* TODO *)
+		| 7 ->
+			KAbstractImpl self#read_abstract_ref
+		| 8 ->
+			(* TODO *)
+			KNormal
+		| i ->
+			error (Printf.sprintf "Invalid class kind id: %i" i)
+
+	method read_class (m : module_def) (c : tclass) =
+		self#read_common_module_type m (Obj.magic c);
+		c.cl_kind <- self#read_class_kind;
+		c.cl_flags <- (Int32.to_int self#read_u32);
+		let read_relation () =
+			let c = self#read_class_ref in
+			let tl = self#read_types in
+			(c,tl)
+		in
+		c.cl_super <- self#read_option read_relation;
+			(* TODO check list 8 vs 16 *)
+		c.cl_implements <- self#read_list16 read_relation;
+		c.cl_dynamic <- self#read_option (fun () -> self#read_type_instance);
+		c.cl_array_access <- self#read_option (fun () -> self#read_type_instance);
+
+	method read_abstract (m : module_def) (a : tabstract) =
+		self#read_common_module_type m (Obj.magic a);
+		a.a_impl <- self#read_option (fun () -> self#read_class_ref);
+		a.a_this <- self#read_type_instance;
+			(* TODO check list 8 vs 16 *)
+		a.a_from <- self#read_list16 (fun () -> self#read_type_instance);
+			(* TODO check list 8 vs 16 *)
+		a.a_from_field <- self#read_list16 (fun () ->
 			let t = self#read_type_instance in
-			let flags = IO.read_i32 ch in
-			let pos = self#read_pos in
-			let name_pos = self#read_pos in
-			let doc = self#read_option (fun () -> self#read_documentation) in
-			let meta = self#read_metadata in
-			(* self#read_type_parameters m ([],name) (fun a -> *)
-			(* 	field_type_parameters <- a *)
-			(* ); *)
-			let params = Array.to_list field_type_parameters in
-			let kind = self#read_field_kind in
-			let expr = self#read_option (fun () -> self#read_texpr) in
-			let expr_unoptimized = self#read_option (fun () -> self#read_texpr) in
-			let overloads = self#read_list16 (fun () -> self#read_class_field m) in
-			{
-				cf_name = name;
-				cf_type = t;
-				cf_pos = pos;
-				cf_name_pos = name_pos;
-				cf_doc = doc;
-				cf_meta = meta;
-				cf_kind = kind;
-				(* cf_expr = None; *)
-				(* cf_expr_unoptimized = None; *)
-				cf_expr = expr;
-				cf_expr_unoptimized = expr_unoptimized;
-				cf_params = params;
-				cf_overloads = overloads;
-				cf_flags = flags;
-			}
-
-		method read_class_fields (m : module_def) (c : tclass) =
-			Printf.eprintf "  Read class fields for %s\n" (snd m.m_path);
-			let f () = self#read_class_field m in
-			begin match c.cl_kind with
-			| KAbstractImpl a ->
-				type_type_parameters <- Array.of_list a.a_params
+			let cf = self#read_field_ref in
+			(t,cf)
+		);
+			(* TODO check list 8 vs 16 *)
+		a.a_to <- self#read_list16 (fun () -> self#read_type_instance);
+			(* TODO check list 8 vs 16 *)
+		a.a_to_field <- self#read_list16 (fun () ->
+			let t = self#read_type_instance in
+			let cf = self#read_field_ref in
+			(t,cf)
+		);
+			(* TODO check list 8 vs 16 *)
+		a.a_array <- self#read_list16 (fun () -> self#read_field_ref);
+		a.a_read <- self#read_option (fun () -> self#read_field_ref);
+		a.a_write <- self#read_option (fun () -> self#read_field_ref);
+		a.a_call <- self#read_option (fun () -> self#read_field_ref);
+		a.a_enum <- self#read_bool
+
+	(* Chunks *)
+
+	method read_string_pool =
+		let l = self#read_uleb128 in
+		(* Printf.eprintf "  Read string pool of size %d\n" l; *)
+		Array.init l (fun i ->
+			self#read_raw_string;
+		);
+
+	method read_chunk =
+		let size = Int32.to_int self#read_u32 in
+		let name = Bytes.unsafe_to_string (IO.nread ch 4) in
+		let data = IO.nread ch size in
+		let crc = self#read_u32 in
+		ignore(crc); (* TODO *)
+		let kind = chunk_kind_of_string name in
+		(kind,data)
+
+	method read_cfld (m : module_def) =
+		let l = self#read_uleb128 in
+		for i = 0 to l - 1 do
+			let c = classes.(i) in
+			self#read_class_fields m c;
+		done
+
+	method read_clsd (m : module_def) =
+		let l = self#read_uleb128 in
+		for i = 0 to l - 1 do
+			let c = classes.(i) in
+			self#read_class m c;
+		done
+
+	method read_absd (m : module_def) =
+		let l = self#read_uleb128 in
+		for i = 0 to l - 1 do
+			let a = abstracts.(i) in
+			self#read_abstract m a;
+		done
+
+	method read_clsr =
+		let l = self#read_uleb128 in
+		(* classes <- Array.append classes (Array.init l (fun i -> *)
+		classes <- (Array.init l (fun i ->
+			let (pack,mname,tname) = self#read_full_path in
+			Printf.eprintf "  Read clsr %d of %d for %s.%s\n" i (l-1) mname tname;
+			match resolve_type pack mname tname with
+			| TClassDecl c ->
+				c
 			| _ ->
-				type_type_parameters <- Array.of_list c.cl_params
-			end;
-			Printf.eprintf "  Read constructor for %s\n" (snd m.m_path);
-			c.cl_constructor <- self#read_option f;
-			Printf.eprintf "  Read ordered fields for %s\n" (snd m.m_path);
-				(* TODO check list 8 vs 16 *)
-			c.cl_ordered_fields <- self#read_list8 f;
-				(* TODO check list 8 vs 16 *)
-			Printf.eprintf "  Read ordered statics for %s\n" (snd m.m_path);
-			c.cl_ordered_statics <- self#read_list8 f;
-			List.iter (fun cf -> c.cl_statics <- PMap.add cf.cf_name cf c.cl_statics) c.cl_ordered_statics;
-
-		(* Module types *)
-
-		method read_common_module_type (m : module_def) (infos : tinfos) =
-			infos.mt_private <- self#read_bool;
-			(* TODO: fix that *)
-			(* infos.mt_doc <- self#read_option (fun () -> self#read_documentation); *)
-			infos.mt_meta <- self#read_metadata;
-			(* TODO update to new type param format? *)
-			self#read_type_parameters m infos.mt_path (fun a ->
-				type_type_parameters <- a
-			);
-			infos.mt_params <- Array.to_list type_type_parameters;
-				(* TODO check list 8 vs 16 *)
-			infos.mt_using <- self#read_list16 (fun () ->
-				let c = self#read_class_ref in
-				let p = self#read_pos in
-				(c,p)
-			)
+				error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname)))
+		))
+		(* classes <- self#read_list16 (fun () -> *)
+		(* 	let (pack,mname,tname) = self#read_full_path in *)
+		(* 	match resolve_type pack mname tname with *)
+		(* 	| TClassDecl c -> *)
+		(* 		c *)
+		(* 	| _ -> *)
+		(* 		error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname))) *)
+		(* ); *)
+
+	method read_absr =
+		let l = self#read_uleb128 in
+		(* abstracts <- Array.append abstracts (Array.init l (fun i -> *)
+		abstracts <- (Array.init l (fun i ->
+			let (pack,mname,tname) = self#read_full_path in
+			Printf.eprintf "  Read absr %d of %d for abstract %s\n" i l tname;
+			match resolve_type pack mname tname with
+			| TAbstractDecl a ->
+				a
+			| _ ->
+				error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname)))
+		))
 
-		method read_class_kind = match self#read_u8 with
+	method read_typf (m : module_def) =
+			(* TODO check list 8 vs 16 *)
+		self#read_list16 (fun () ->
+			let kind = self#read_u8 in
+			let path = self#read_path in
+			let pos = self#read_pos in
+			let name_pos = self#read_pos in
+			let mt = match kind with
 			| 0 ->
-				KNormal
+				let c = mk_class m path pos name_pos in
+				TClassDecl c
 			| 1 ->
-				KTypeParameter self#read_types
+				let en = mk_enum m path pos name_pos in
+				TEnumDecl en
 			| 2 ->
-				KExpr ((EBlock []),null_pos) (* TODO *)
+				let td = mk_typedef m path pos name_pos (mk_mono()) in
+				TTypeDecl td
 			| 3 ->
-				KGeneric
-			| 4 ->
-				let c = self#read_class_ref in
-				let tl = self#read_types in
-				KGenericInstance(c,tl)
-			| 5 ->
-				KMacroType
-			| 6 ->
-				KGenericBuild [] (* TODO *)
-			| 7 ->
-				KAbstractImpl self#read_abstract_ref
-			| 8 ->
-				(* TODO *)
-				KNormal
-			| i ->
-				error (Printf.sprintf "Invalid class kind id: %i" i)
-
-		method read_class (m : module_def) (c : tclass) =
-			self#read_common_module_type m (Obj.magic c);
-			c.cl_kind <- self#read_class_kind;
-			c.cl_flags <- (Int32.to_int self#read_u32);
-			let read_relation () =
-				let c = self#read_class_ref in
-				let tl = self#read_types in
-				(c,tl)
+				let a = mk_abstract m path pos name_pos in
+				TAbstractDecl a
+			| _ ->
+				error ("Invalid type kind: " ^ (string_of_int kind));
 			in
-			c.cl_super <- self#read_option read_relation;
-				(* TODO check list 8 vs 16 *)
-			c.cl_implements <- self#read_list16 read_relation;
-			c.cl_dynamic <- self#read_option (fun () -> self#read_type_instance);
-			c.cl_array_access <- self#read_option (fun () -> self#read_type_instance);
-
-		method read_abstract (m : module_def) (a : tabstract) =
-			self#read_common_module_type m (Obj.magic a);
-			a.a_impl <- self#read_option (fun () -> self#read_class_ref);
-			a.a_this <- self#read_type_instance;
-				(* TODO check list 8 vs 16 *)
-			a.a_from <- self#read_list16 (fun () -> self#read_type_instance);
-				(* TODO check list 8 vs 16 *)
-			a.a_from_field <- self#read_list16 (fun () ->
-				let t = self#read_type_instance in
-				let cf = self#read_field_ref in
-				(t,cf)
-			);
-				(* TODO check list 8 vs 16 *)
-			a.a_to <- self#read_list16 (fun () -> self#read_type_instance);
-				(* TODO check list 8 vs 16 *)
-			a.a_to_field <- self#read_list16 (fun () ->
-				let t = self#read_type_instance in
-				let cf = self#read_field_ref in
-				(t,cf)
-			);
-				(* TODO check list 8 vs 16 *)
-			a.a_array <- self#read_list16 (fun () -> self#read_field_ref);
-			a.a_read <- self#read_option (fun () -> self#read_field_ref);
-			a.a_write <- self#read_option (fun () -> self#read_field_ref);
-			a.a_call <- self#read_option (fun () -> self#read_field_ref);
-			a.a_enum <- self#read_bool
-
-		(* Chunks *)
-
-		method read_string_pool =
-			let l = self#read_uleb128 in
-			(* Printf.eprintf "  Read string pool of size %d\n" l; *)
-			Array.init l (fun i ->
-				self#read_raw_string;
-			);
-
-		method read_chunk =
-			let size = Int32.to_int self#read_u32 in
-			let name = Bytes.unsafe_to_string (IO.nread ch 4) in
-			let data = IO.nread ch size in
-			let crc = self#read_u32 in
-			ignore(crc); (* TODO *)
-			let kind = chunk_kind_of_string name in
-			(kind,data)
-
-		method read_cfld (m : module_def) =
-			let l = self#read_uleb128 in
-			for i = 0 to l - 1 do
-				let c = classes.(i) in
-				self#read_class_fields m c;
-			done
-
-		method read_clsd (m : module_def) =
-			let l = self#read_uleb128 in
-			for i = 0 to l - 1 do
-				let c = classes.(i) in
-				self#read_class m c;
-			done
-
-		method read_absd (m : module_def) =
-			let l = self#read_uleb128 in
-			for i = 0 to l - 1 do
-				let a = abstracts.(i) in
-				self#read_abstract m a;
-			done
-
-		method read_clsr =
-			let l = self#read_uleb128 in
-			classes <- Array.append classes (Array.init l (fun i ->
-				let (pack,mname,tname) = self#read_full_path in
-				Printf.eprintf "  Read clsr %d of %d for %s.%s\n" i (l-1) mname tname;
-				match resolve_type pack mname tname with
-				| TClassDecl c ->
-					c
-				| _ ->
-					error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname)))
-			))
-			(* classes <- self#read_list16 (fun () -> *)
-			(* 	let (pack,mname,tname) = self#read_full_path in *)
-			(* 	match resolve_type pack mname tname with *)
-			(* 	| TClassDecl c -> *)
-			(* 		c *)
-			(* 	| _ -> *)
-			(* 		error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname))) *)
-			(* ); *)
-
-		method read_absr =
-			let l = self#read_uleb128 in
-			abstracts <- Array.append abstracts (Array.init l (fun i ->
-				let (pack,mname,tname) = self#read_full_path in
-				Printf.eprintf "  Read absr %d of %d for abstract %s\n" i l tname;
-				match resolve_type pack mname tname with
-				| TAbstractDecl a ->
-					a
-				| _ ->
-					error ("Unexpected type where class was expected: " ^ (s_type_path (pack,tname)))
-			))
-
-		method read_typf (m : module_def) =
-				(* TODO check list 8 vs 16 *)
-			self#read_list16 (fun () ->
-				let kind = self#read_u8 in
-				let path = self#read_path in
-				let pos = self#read_pos in
-				let name_pos = self#read_pos in
-				let mt = match kind with
-				| 0 ->
-					let c = mk_class m path pos name_pos in
-					TClassDecl c
-				| 1 ->
-					let en = mk_enum m path pos name_pos in
-					TEnumDecl en
-				| 2 ->
-					let td = mk_typedef m path pos name_pos (mk_mono()) in
-					TTypeDecl td
-				| 3 ->
-					let a = mk_abstract m path pos name_pos in
-					TAbstractDecl a
-				| _ ->
-					error ("Invalid type kind: " ^ (string_of_int kind));
-				in
-				mt
-			)
+			mt
+		)
 
-		method read_hhdr =
-			let path = self#read_path in
-			let file = self#read_string in
-			let m = make_module path file in
-			m
-
-		method read (debug : bool) (p : pos) =
-			(* TODO: add it to writer! *)
-			(* if (Bytes.to_string (IO.nread ch 3)) <> "hxb" then *)
-			(* 	raise (HxbFailure "magic"); *)
-			(* let version = self#read_u8 in *)
-			(* ignore(version); *)
-			let rec loop acc =
-				(* ch <- file_ch; *)
-				let chunk = self#read_chunk in
-				match fst chunk with
-				| HEND ->
-					List.rev acc
-				| _ ->
-					loop (chunk :: acc)
-			in
-			let chunks = loop [] in
-			let chunks = List.sort (fun (kind1,_) (kind2,_) ->
-				(Obj.magic kind1) - (Obj.magic kind2)
-			) chunks in
-			let rec pass_0 chunks = match chunks with
-				| [] ->
-					raise (HxbFailure "Missing HHDR chunk")
-				| (kind,data) :: chunks ->
-					ch <- IO.input_bytes data;
-					match kind with
-					| HHDR ->
-						let m = self#read_hhdr in
-						m,chunks
-					| STRI ->
-						(* string_pool <- Array.concat [string_pool; self#read_string_pool]; *)
-						string_pool <- self#read_string_pool;
-						(* Array.iteri (fun i s -> *)
-						(* 	Printf.eprintf "  [Pool] string #%d %s\n" i s; *)
-						(* ) string_pool; *)
-						pass_0 chunks
-					| DOCS ->
-						(* doc_pool <- Array.concat [doc_pool; self#read_string_pool]; *)
-						doc_pool <- self#read_string_pool;
-						(* Array.iteri (fun i s -> *)
-						(* 	Printf.eprintf "  [Pool] doc string #%d %s\n" i s; *)
-						(* ) doc_pool; *)
-						pass_0 chunks
-					| _ ->
-						raise (HxbFailure ("Unexpected early chunk: " ^ (string_of_chunk_kind kind)))
-			in
-			let m,chunks = pass_0 chunks in
-			List.iter (fun (kind,data) ->
-				Printf.eprintf "Reading chunk %s\n" (string_of_chunk_kind kind);
+	method read_hhdr =
+		let path = self#read_path in
+		let file = self#read_string in
+		let m = make_module path file in
+		m
+
+	method read (debug : bool) (p : pos) =
+		(* TODO: add it to writer! *)
+		(* if (Bytes.to_string (IO.nread ch 3)) <> "hxb" then *)
+		(* 	raise (HxbFailure "magic"); *)
+		(* let version = self#read_u8 in *)
+		(* ignore(version); *)
+		let rec loop acc =
+			(* ch <- file_ch; *)
+			let chunk = self#read_chunk in
+			match fst chunk with
+			| HEND ->
+				List.rev acc
+			| _ ->
+				loop (chunk :: acc)
+		in
+		let chunks = loop [] in
+		let chunks = List.sort (fun (kind1,_) (kind2,_) ->
+			(Obj.magic kind1) - (Obj.magic kind2)
+		) chunks in
+		let rec pass_0 chunks = match chunks with
+			| [] ->
+				raise (HxbFailure "Missing HHDR chunk")
+			| (kind,data) :: chunks ->
 				ch <- IO.input_bytes data;
 				match kind with
-				| TYPF ->
-					m.m_types <- self#read_typf m;
-					add_module m;
-				| CLSR ->
-					self#read_clsr;
-				| ABSR ->
-					self#read_absr;
-				| CLSD ->
-					self#read_clsd m;
-				| CFLD ->
-					Printf.eprintf "  Read class fields\n";
-					self#read_cfld m;
-				| ABSD ->
-					self#read_absd m;
+				| HHDR ->
+					let m = self#read_hhdr in
+					m,chunks
+				| STRI ->
+					(* string_pool <- Array.concat [string_pool; self#read_string_pool]; *)
+					string_pool <- self#read_string_pool;
+					(* Array.iteri (fun i s -> *)
+					(* 	Printf.eprintf "  [Pool] string #%d %s\n" i s; *)
+					(* ) string_pool; *)
+					pass_0 chunks
+				| DOCS ->
+					(* doc_pool <- Array.concat [doc_pool; self#read_string_pool]; *)
+					doc_pool <- self#read_string_pool;
+					(* Array.iteri (fun i s -> *)
+					(* 	Printf.eprintf "  [Pool] doc string #%d %s\n" i s; *)
+					(* ) doc_pool; *)
+					pass_0 chunks
 				| _ ->
-					raise (HxbFailure ("Unexpected late chunk: " ^ (string_of_chunk_kind kind)))
-			) chunks;
-			m
-	end
+					raise (HxbFailure ("Unexpected early chunk: " ^ (string_of_chunk_kind kind)))
+		in
+		let m,chunks = pass_0 chunks in
+		List.iter (fun (kind,data) ->
+			Printf.eprintf "Reading chunk %s\n" (string_of_chunk_kind kind);
+			ch <- IO.input_bytes data;
+			match kind with
+			| TYPF ->
+				m.m_types <- self#read_typf m;
+				add_module m;
+			| CLSR ->
+				self#read_clsr;
+			| ABSR ->
+				self#read_absr;
+			| CLSD ->
+				self#read_clsd m;
+			| CFLD ->
+				Printf.eprintf "  Read class fields\n";
+				self#read_cfld m;
+			| ABSD ->
+				self#read_absd m;
+			| _ ->
+				raise (HxbFailure ("Unexpected late chunk: " ^ (string_of_chunk_kind kind)))
+		) chunks;
+		m
+end

src/compiler/hxb/hxbWriter.ml

@@ -425,20 +425,25 @@ class ['a] hxb_writer
 
 	method write_texpr (e : texpr) =
 		Printf.eprintf "  Print texpr\n";
-		self#write_pos e.epos;
-		let curmin = ref e.epos.pmin in
-		let curmax = ref e.epos.pmax in
-		let check_diff p =
-			let dmin = p.pmin - !curmin in
-			let dmax = p.pmax - !curmax in
-			chunk#write_i16 dmin;
-			chunk#write_i16 dmax;
-			curmin := p.pmin;
-			curmax := p.pmax;
-		in
+		(* self#write_pos e.epos; *)
+		(* let curmin = ref e.epos.pmin in *)
+		(* let curmax = ref e.epos.pmax in *)
+
+		(* TODO fix that *)
+		(* let check_diff p = *)
+		(* 	let dmin = p.pmin - !curmin in *)
+		(* 	let dmax = p.pmax - !curmax in *)
+		(* 	(1* chunk#write_i16 dmin; *1) *)
+		(* 	(1* chunk#write_i16 dmax; *1) *)
+		(* 	curmin := p.pmin; *)
+		(* 	curmax := p.pmax; *)
+		(* in *)
+
 		let rec loop e =
 			self#write_type_instance e.etype;
-			check_diff e.epos;
+			(* check_diff e.epos; *)
+			self#write_pos e.epos;
+
 			match e.eexpr with
 			(* values 0-19 *)
 			| TConst ct ->
@@ -740,13 +745,14 @@ class ['a] hxb_writer
 		Printf.eprintf " Write class field %s\n" cf.cf_name;
 		self#set_field_type_parameters cf.cf_params;
 		chunk#write_string cf.cf_name;
-		(* chunk#write_list cf.cf_params self#write_type_parameter_forward; *)
-		(* chunk#write_list cf.cf_params self#write_type_parameter_data; *)
+		chunk#write_list cf.cf_params self#write_type_parameter_forward;
+		chunk#write_list cf.cf_params self#write_type_parameter_data;
+		Printf.eprintf "  Field type params: %d\n" (List.length cf.cf_params);
 		self#write_type_instance cf.cf_type;
 		chunk#write_i32 cf.cf_flags;
 		self#write_pos cf.cf_pos;
 		self#write_pos cf.cf_name_pos;
-		chunk#write_option cf.cf_doc self#write_documentation;
+		(* chunk#write_option cf.cf_doc self#write_documentation; *)
 		self#write_metadata cf.cf_meta;
 		self#write_field_kind cf.cf_kind;
 		chunk#write_option cf.cf_expr self#write_texpr;
@@ -900,8 +906,10 @@ class ['a] hxb_writer
 			chunk#write_list own_classes (fun c ->
 				begin match c.cl_kind with
 				| KAbstractImpl a ->
+					Printf.eprintf "\n === Write CFLD for %s ===\n" (snd a.a_path);
 					self#select_type a.a_path
 				| _ ->
+					Printf.eprintf "\n === Write CFLD for %s ===\n" (snd c.cl_path);
 					self#select_type c.cl_path;
 				end;
 				chunk#write_option c.cl_constructor self#write_class_field;

src/compiler/messageReporting.ml

@@ -178,6 +178,7 @@ let compiler_pretty_message_string com ectx cm =
 		(* Error source *)
 		if display_source then out := List.fold_left (fun out (l, line) ->
 			let nb_len = String.length (string_of_int l) in
+			let gutter = gutter_len - nb_len - 1 in
 
 			(* Replace tabs with 1 space to avoid column misalignments *)
 			let line = String.concat " " (ExtString.String.nsplit line "\t") in
@@ -185,7 +186,7 @@ let compiler_pretty_message_string com ectx cm =
 
 			out ^ Printf.sprintf "%s%s | %s\n"
 				(* left-padded line number *)
-				(String.make (gutter_len-nb_len-1) ' ')
+				(if gutter < 1 then "" else String.make gutter ' ')
 				(if l = 0 then "-" else Printf.sprintf "%d" l)
 				(* Source code at that line *)
 				(
@@ -297,6 +298,14 @@ let get_max_line max_lines messages =
 		else max_lines
 	) max_lines messages
 
+let display_source_at com p =
+	let ectx = create_error_context () in
+	let msg = make_compiler_message "" p 0 MessageKind.DKCompilerMessage MessageSeverity.Information in
+	ectx.max_lines <- get_max_line ectx.max_lines [msg];
+	match compiler_pretty_message_string com ectx msg with
+		| None -> ()
+		| Some s -> Printf.eprintf "%s\n" s
+
 exception ConfigError of string
 
 let get_formatter com ectx def default =

src/core/tFunctions.ml

@@ -248,6 +248,17 @@ let null_tdef =
 	(* TODO better null type? *)
 	mk_typedef null_module ([],"") null_pos null_pos (TDynamic None)
 
+let null_tvar = {
+	v_id = -1;
+	v_name = "";
+	v_type = t_dynamic;
+	v_kind = VGenerated;
+	v_flags = 0;
+	v_extra = None;
+	v_meta = [];
+	v_pos = null_pos;
+}
+
 let add_dependency ?(skip_postprocess=false) m mdep =
 	if m != null_module && (m.m_path != mdep.m_path || m.m_extra.m_sign != mdep.m_extra.m_sign) then begin
 		m.m_extra.m_deps <- PMap.add mdep.m_id (mdep.m_extra.m_sign, mdep.m_path) m.m_extra.m_deps;

src/typing/typeloadModule.ml

@@ -798,11 +798,8 @@ let type_module ctx mpath file ?(dont_check_path=false) ?(is_extern=false) tdecl
 let type_module_hook = ref (fun _ _ _ -> None)
 
 let reader : HxbReader.hxb_reader option ref = ref None
-let rec get_reader ctx input p = match !reader with
-	| Some r ->
-		r#set_input input;
-		r
-	| None ->
+
+let rec get_reader ctx input p =
 		let make_module path file = ModuleLevel.make_module ctx path file p in
 		let add_module m = ctx.com.module_lut#add m.m_path m in
 
@@ -811,9 +808,24 @@ let rec get_reader ctx input p = match !reader with
 			List.find (fun t -> snd (t_path t) = tname) m.m_types;
 		in
 
-		let r = new HxbReader.hxb_reader input make_module add_module resolve_type in
-		reader := Some r;
-		r
+		new HxbReader.hxb_reader ctx.com input make_module add_module resolve_type
+
+(* let rec get_reader ctx input p = match !reader with *)
+(* 	| Some r -> *)
+(* 		r#set_input input; *)
+(* 		r *)
+(* 	| None -> *)
+(* 		let make_module path file = ModuleLevel.make_module ctx path file p in *)
+(* 		let add_module m = ctx.com.module_lut#add m.m_path m in *)
+
+(* 		let resolve_type pack mname tname = *)
+(* 			let m = try ctx.com.module_lut#find (pack,mname) with Not_found -> load_module' ctx ctx.g (pack,mname) p in *)
+(* 			List.find (fun t -> snd (t_path t) = tname) m.m_types; *)
+(* 		in *)
+
+(* 		let r = new HxbReader.hxb_reader ctx.com input make_module add_module resolve_type in *)
+(* 		reader := Some r; *)
+(* 		r *)
 
 and load_hxb_module ctx path p =
 	(* Modules failing to load so far *)