[hxb] more cleanup / debug data

src/compiler/generate.ml

@@ -3,7 +3,7 @@ open CompilationContext
 open TType
 open Tanon_identification
 
-let test_hxb com m =
+let export_hxb com m =
 	if m.m_extra.m_kind = MCode then begin
 		let ch = IO.output_bytes() in
 		let anon_identification = new tanon_identification ([],"") in
@@ -46,7 +46,7 @@ let check_auxiliary_output com actx =
 				Path.mkdir_from_path file;
 				let t = Timer.timer ["generate";"hxb"] in
 				(* HxbWriter.write com file; *)
-				List.iter (test_hxb com) com.modules;
+				List.iter (export_hxb com) com.modules;
 				t();
 	end
 

src/compiler/hxb/hxbReader.ml

@@ -852,11 +852,9 @@ class hxb_reader
 			);
 			let t = self#read_type_instance in
 			let impl = Option.get a.a_impl in
-			Printf.eprintf "  Read field ref for abstract from field %s (a = %s)\n" name (s_type_path a.a_path);
-			Printf.eprintf "   Impl has %d fields and %d statics\n" (List.length impl.cl_ordered_fields) (List.length impl.cl_ordered_statics);
-			(* let cf = self#read_field_ref (Option.get a.a_impl).cl_fields in *)
+			(* Printf.eprintf "  Read field ref for abstract from field %s (a = %s)\n" name (s_type_path a.a_path); *)
+			(* Printf.eprintf "   Impl has %d fields and %d statics\n" (List.length impl.cl_ordered_fields) (List.length impl.cl_ordered_statics); *)
 			let cf = self#read_field_ref (s_type_path impl.cl_path) impl.cl_statics in
-			(* let cf = self#read_field_ref (Option.get a.a_impl).cl_statics in *)
 			(t,cf)
 		);
 		a.a_to <- self#read_list16 (fun () -> self#read_type_instance);

src/compiler/hxb/hxbWriter.ml

@@ -4,6 +4,14 @@ open Type
 open HxbData
 open Tanon_identification
 
+(* Debug utils *)
+let no_color = false
+let c_reset = if no_color then "" else "\x1b[0m"
+let c_bold = if no_color then "" else "\x1b[1m"
+let c_dim = if no_color then "" else "\x1b[2m"
+let todo = "\x1b[33m[TODO]" ^ c_reset
+let todo_error = "\x1b[41m[TODO] error:" ^ c_reset
+
 type field_source =
 	| ClassStatic of tclass
 	| ClassMember of tclass
@@ -256,6 +264,7 @@ class ['a] hxb_writer
 	method write_metadata_entry ((meta,el,p) : metadata_entry) =
 		chunk#write_string (Meta.to_string meta);
 		(* TODO: el -_- *)
+		Printf.eprintf "  %s metadata entry - expr def\n" todo;
 		self#write_pos p
 
 	method write_metadata ml =
@@ -288,7 +297,6 @@ class ['a] hxb_writer
 		chunk#write_uleb128 i
 
 	method write_field_ref (source : field_source) (cf : tclass_field) =
-		(* TODO: is this enough? :x *)
 		chunk#write_string cf.cf_name
 
 	method write_enum_field_ref ef =
@@ -392,8 +400,9 @@ class ['a] hxb_writer
 		| TAnon an ->
 			let pfm = Option.get (anon_id#identify true t) in
 			chunk#write_byte 51;
-			chunk#write_uleb128 (anons#get_or_add pfm.pfm_path an)
-			(* TODO? *)
+			chunk#write_uleb128 (anons#get_or_add pfm.pfm_path an);
+			Printf.eprintf "  %s TAnon an\n" todo;
+			(* TODO TAnon *)
 			(* begin match !(an.a_status) with
 			| Closed -> chunk#write_byte 50
 			| Const -> chunk#write_byte 51
@@ -632,6 +641,7 @@ class ['a] hxb_writer
 			| TField(e1,FAnon cf) ->
 				chunk#write_byte 104;
 				loop e1;
+				Printf.eprintf "  %s TField(e,FAnon cf)\n" todo;
 				(* TODO *)
 				(* self#write_field_ref (ClassMember c) cf; (1* TODO check source *1) *)
 			| TField(e1,FClosure(Some(c,tl),cf)) ->
@@ -644,6 +654,7 @@ class ['a] hxb_writer
 			| TField(e1,FClosure(None,cf)) ->
 				chunk#write_byte 106;
 				loop e1;
+				Printf.eprintf "  %s TField(e,FClosure(None,cf))\n" todo;
 				(* TODO *)
 				(* self#write_field_ref (ClassMember c) cf; (1* TODO check source *1) *)
 			| TField(e1,FEnum(en,ef)) ->
@@ -805,6 +816,7 @@ class ['a] hxb_writer
 			self#write_types tl;
 		| KExpr e ->
 			chunk#write_byte 2;
+			Printf.eprintf "  %s KExpr\n" todo;
 			(* TODO *)
 		| KGeneric ->
 			chunk#write_byte 3;
@@ -816,12 +828,14 @@ class ['a] hxb_writer
 			chunk#write_byte 5;
 		| KGenericBuild l ->
 			chunk#write_byte 6;
+			Printf.eprintf "  %s KGenericBuild\n" todo;
 			(* TODO *)
 		| KAbstractImpl a ->
 			chunk#write_byte 7;
 			self#write_abstract_ref a;
 		| KModuleFields md ->
 			chunk#write_byte 8;
+			Printf.eprintf "  %s KModuleFields\n" todo;
 			(* TODO *)
 
 	method write_class (c : tclass) =
@@ -980,7 +994,7 @@ class ['a] hxb_writer
 					chunk#write_byte ef.ef_index
 				);
 		| TAbstractDecl a ->
-				(* TODO *)
+				(* TODO ? *)
 				()
 		| TTypeDecl t -> ()