[hxb] fix gadt

src/compiler/hxb/hxbReader.ml

@@ -630,9 +630,22 @@ class hxb_reader
 			let tl = self#read_types in
 			TEnum(e,tl)
 		| 16 ->
-			let t = self#read_typedef_ref in
-			let tl = self#read_types in
-			TType(t,tl)
+			begin match self#read_u8 with
+				| 0 ->
+					let an = mk_anon (ref Closed) in
+					let tl = self#read_types in
+					let td = { null_typedef with t_type = an } in
+					TType(td,tl)
+				| 1 ->
+					let an = TAnon self#read_anon_ref in
+					let tl = self#read_types in
+					let td = { null_typedef with t_type = an } in
+					TType(td,tl)
+				| _ ->
+					let t = self#read_typedef_ref in
+					let tl = self#read_types in
+					TType(t,tl)
+			end
 		| 17 ->
 			let a = self#read_abstract_ref in
 			let tl = self#read_types in

src/compiler/hxb/hxbWriter.ml

@@ -385,9 +385,19 @@ class ['a] hxb_writer
 			self#write_types tl
 		| TType(td,tl) ->
 			chunk#write_byte 16;
-			(* Printf.eprintf "  TType %d for %s\n" 16 (s_type_path td.t_path); *)
-			self#write_typedef_ref td;
-			self#write_types tl
+			begin match td.t_type with
+				| TAnon an when PMap.is_empty an.a_fields ->
+					chunk#write_byte 0;
+					self#write_types tl
+				| TAnon an ->
+					chunk#write_byte 1;
+					self#write_anon_ref an;
+					self#write_types tl
+				| _ ->
+					chunk#write_byte 2;
+					self#write_typedef_ref td;
+					self#write_types tl
+			end;
 		| TAbstract(a,tl) ->
 			chunk#write_byte 17;
 			self#write_abstract_ref a;

tests/unit/src/unit/TestMain.hx

@@ -69,7 +69,7 @@ function main() {
 		new TestMeta(),
 		new TestType(),
 		new TestOrder(),
-		// new TestGADT(), // Cannot resolve type unit.TestGADT.Enum<unit.Expr>
+		new TestGADT(),
 		new TestGeneric(),
 		new TestArrowFunctions(),
 		new TestCasts(),
@@ -81,7 +81,7 @@ function main() {
 		new TestRest(),
 		new TestHttp(),
 		#if !no_pattern_matching
-		// new TestMatch(), // Cannot resolve type unit.TestMatch.Enum<unit.A>
+		new TestMatch(),
 		#end
 		#if cs
 		new TestCSharp(),

tests/unit/src/unitstd/Std.unit.hx

@@ -55,8 +55,8 @@ Std.string(cwts) == "ClassWithToString.toString()";
 Std.string(cwtsc) == "ClassWithToString.toString()";
 Std.string(cwtsc2) == "ClassWithToStringChild2.toString()";
 
-// Std.string(SomeEnum.NoArguments) == "NoArguments";
-// Std.string(SomeEnum.OneArgument("foo")) == "OneArgument(foo)";
+Std.string(SomeEnum.NoArguments) == "NoArguments";
+Std.string(SomeEnum.OneArgument("foo")) == "OneArgument(foo)";
 
 Std.string(null) == "null";