ANFR earlier

src/compiler/hxb/hxbData.ml

@@ -9,6 +9,7 @@ type chunk_kind =
 	| STRI (* string pool *)
 	| DOCS (* doc pool *)
 	| HHDR (* module header *)
+	| ANFR (* anon field references *)
 	| TYPF (* forward types *)
 	| CLSR (* class reference array *)
 	| ABSR (* abstract reference array *)
@@ -17,7 +18,6 @@ type chunk_kind =
 	| CLSD (* class definition *)
 	| ABSD (* abstract definition *)
 	| ENFR (* enum field references *)
-	| ANFR (* anon field references *)
 	| CFLR (* class field references *)
 	| CFLD (* class fields *)
 	| AFLD (* abstract fields *)
@@ -30,6 +30,7 @@ let string_of_chunk_kind = function
 	| STRI -> "STRI"
 	| DOCS -> "DOCS"
 	| HHDR -> "HHDR"
+	| ANFR -> "ANFR"
 	| TYPF -> "TYPF"
 	| CLSR -> "CLSR"
 	| ABSR -> "ABSR"
@@ -38,7 +39,6 @@ let string_of_chunk_kind = function
 	| CLSD -> "CLSD"
 	| ABSD -> "ABSD"
 	| ENFR -> "ENFR"
-	| ANFR -> "ANFR"
 	| CFLR -> "CFLR"
 	| CFLD -> "CFLD"
 	| AFLD -> "AFLD"

src/compiler/hxb/hxbReader.ml

@@ -1163,11 +1163,6 @@ class hxb_reader
 		cf.cf_params <- !params;
 		cf.cf_flags <- flags;
 
-	method read_class_field (nested : bool) =
-		let cf = self#read_class_field_forward in
-		self#read_class_field_data nested cf;
-		cf
-
 	method read_class_fields (c : tclass) =
 		begin match c.cl_kind with
 		| KAbstractImpl a ->
@@ -1648,6 +1643,9 @@ class hxb_reader
 			| HHDR ->
 				current_module <- self#read_hhdr;
 				loop()
+			| ANFR ->
+				self#read_anfr;
+				loop()
 			| TYPF ->
 				current_module.m_types <- self#read_typf;
 				api#add_module current_module;
@@ -1673,9 +1671,6 @@ class hxb_reader
 			| ENFR ->
 				self#read_enfr;
 				loop()
-			| ANFR ->
-				self#read_anfr;
-				loop()
 			| CFLR ->
 				self#read_cflr;
 				loop();