remove context flushing from encoder

This should no longer be necessary. I'm adding the relevant tests to make sure.

src/macro/eval/evalContext.ml

@@ -403,10 +403,6 @@ let exc_string_p str p = throw (vstring (EvalString.create_ascii str)) p
 
 let error_message = exc_string
 
-let flush_core_context f =
-	let ctx = get_ctx() in
-	ctx.curapi.MacroApi.flush_context f
-
 (* Environment handling *)
 
 let no_timer = fun () -> ()

src/macro/macroApi.ml

@@ -63,7 +63,6 @@ type 'value compiler_api = {
 	encode_expr : Ast.expr -> 'value;
 	encode_ctype : Ast.type_hint -> 'value;
 	decode_type : 'value -> t;
-	flush_context : (unit -> t) -> t;
 	info : ?depth:int -> string -> pos -> unit;
 	warning : ?depth:int -> Warning.warning -> string -> pos -> unit;
 	display_error : ?depth:int -> (string -> pos -> unit);
@@ -172,8 +171,6 @@ module type InterpApi = sig
 
 	val value_string : value -> string
 
-	val flush_core_context : (unit -> t) -> t
-
 	val handle_decoding_error : (string -> unit) -> value -> Type.t -> (string * int) list
 
 	val get_api_call_pos : unit -> pos
@@ -1099,7 +1096,7 @@ and encode_cfield f =
 		"params", encode_type_params f.cf_params;
 		"meta", encode_meta f.cf_meta (fun m -> f.cf_meta <- m);
 		"expr", vfun0 (fun() ->
-			ignore (flush_core_context (fun() -> follow f.cf_type));
+			ignore (follow f.cf_type);
 			(match f.cf_expr with None -> vnull | Some e -> encode_texpr e)
 		);
 		"kind", encode_field_kind f.cf_kind;
@@ -1266,8 +1263,7 @@ and encode_lazy_type t =
 					| LAvailable t ->
 						encode_type t
 					| LWait _ ->
-						(* we are doing some typing here, let's flush our context if it's not already *)
-						encode_type (flush_core_context (fun() -> lazy_type f))
+						encode_type (lazy_type f)
 					| LProcessing _ ->
 						(* our type in on the processing stack, error instead of returning most likely an unbound mono *)
 						error_message "Accessing a type while it's being typed");

src/typing/macroContext.ml

@@ -214,9 +214,6 @@ let make_macro_com_api com mcom p =
 		type_expr = (fun e ->
 			Interp.exc_string "unsupported"
 		);
-		flush_context = (fun f ->
-			Interp.exc_string "unsupported"
-		);
 		store_typed_expr = (fun te ->
 			let p = te.epos in
 			snd (Typecore.store_typed_expr com te p)
@@ -431,9 +428,6 @@ let make_macro_api ctx mctx p =
 		MacroApi.type_expr = (fun e ->
 			typing_timer ctx true (fun() -> type_expr ctx e WithType.value)
 		);
-		MacroApi.flush_context = (fun f ->
-			typing_timer ctx true f
-		);
 		MacroApi.type_patch = (fun t f s v ->
 			typing_timer ctx false (fun() ->
 				let v = (match v with None -> None | Some s ->

tests/misc/projects/Issue5456/Main.hx

@@ -0,0 +1,3 @@
+function main() {
+	trace(new Test().c);
+}

tests/misc/projects/Issue5456/Test.hx

@@ -0,0 +1,16 @@
+package;
+
+import test.C;
+
+@:build(TestBuilder.build())
+class Test extends B {
+	public function new() {
+		super();
+	}
+}
+
+class B {
+	public var c:Int = C.func();
+
+	public function new() {}
+}

tests/misc/projects/Issue5456/TestBuilder.hx

@@ -0,0 +1,20 @@
+package;
+
+import haxe.macro.Context;
+import haxe.macro.Expr;
+import haxe.macro.Type;
+
+class TestBuilder {
+	public static function build():Array<Field> {
+		var fields:Array<Field> = Context.getBuildFields();
+		var classType:ClassType;
+		switch (Context.getLocalType()) {
+			case TInst(r, _):
+				classType = r.get();
+			case _:
+		}
+		classType.superClass.t.get().fields.get();
+
+		return fields;
+	}
+}

tests/misc/projects/Issue5456/compile.hxml

@@ -0,0 +1,2 @@
+--main Main
+--interp

tests/misc/projects/Issue5456/compile.hxml.stdout

@@ -0,0 +1 @@
+Main.hx:2: 0

tests/misc/projects/Issue5456/test/C.hx

@@ -0,0 +1,7 @@
+package test;
+
+class C {
+	public static function func():Int {
+		return 0;
+	}
+}

tests/misc/projects/Issue6321/A.hx

@@ -0,0 +1,3 @@
+class A {
+    public var a:Int;
+}

tests/misc/projects/Issue6321/B.hx

@@ -0,0 +1,4 @@
+class B {
+    var a:A;
+    function b() a.a;
+}

tests/misc/projects/Issue6321/Macro.hx

@@ -0,0 +1,14 @@
+class Macro {
+	static function doStuff() {
+		haxe.macro.Context.onAfterInitMacros(() -> {
+			switch (haxe.macro.Context.getType("B")) {
+				case TInst(_.get() => cl, _):
+					for (field in cl.fields.get()) {
+						trace(field.name, field.expr()?.pos);
+					}
+				default:
+					throw false;
+			}
+		});
+	}
+}

tests/misc/projects/Issue6321/MacroFail.hx

@@ -0,0 +1,12 @@
+class MacroFail {
+	static function doStuff() {
+		switch (haxe.macro.Context.getType("B")) {
+			case TInst(_.get() => cl, _):
+				for (field in cl.fields.get()) {
+					trace(field.name, field.expr()?.pos);
+				}
+			default:
+				throw false;
+		}
+	}
+}

tests/misc/projects/Issue6321/compile-fail.hxml

@@ -0,0 +1 @@
+--macro "MacroFail.doStuff()"

tests/misc/projects/Issue6321/compile-fail.hxml.stderr

@@ -0,0 +1,2 @@
+MacroFail.hx:3: characters 11-42 : Cannot use this API from initialization macros.
+MacroFail.hx:3: characters 11-42 : ... Use `Context.onAfterInitMacros` to register a callback to run when context is ready.

tests/misc/projects/Issue6321/compile.hxml

@@ -0,0 +1 @@
+--macro "Macro.doStuff()"

tests/misc/projects/Issue6321/compile.hxml.stdout

@@ -0,0 +1,2 @@
+Macro.hx:7: a,null
+Macro.hx:7: b,#pos(B.hx:3: characters 18-21)

tests/misc/projects/Issue6321/test/C.hx

@@ -0,0 +1,7 @@
+package test;
+
+class C {
+	public static function func():Int {
+		return 0;
+	}
+}