From 613b0291c4976a8169aa643cdcc408c7d6b69da9 Mon Sep 17 00:00:00 2001
From: Rudy Ges <k@klabz.org>
Date: Fri, 20 Oct 2023 10:10:54 +0200
Subject: [PATCH] [macro] fix TVar resolution (#11339)

---
 std/haxe/macro/Type.hx | 72 +++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/std/haxe/macro/Type.hx b/std/haxe/macro/Type.hx
index 4e2a20deb8b..4ee0afe1aef 100644
--- a/std/haxe/macro/Type.hx
+++ b/std/haxe/macro/Type.hx
@@ -736,42 +736,6 @@ enum TConstant {
 	TSuper;
 }
 
-/**
-	Represents a variable in the typed AST.
- */
-typedef TVar = {
-	/**
-		The unique ID of the variable.
-	**/
-	public var id(default, never):Int;
-
-	/**
-		The name of the variable.
-	**/
-	public var name(default, never):String;
-
-	/**
-		The type of the variable.
-	**/
-	public var t(default, never):Type;
-
-	/**
-		Whether or not the variable has been captured by a closure.
-	**/
-	public var capture(default, never):Bool;
-
-	/**
-		Special information which is internally used to keep track of closure.
-		information
-	**/
-	public var extra(default, never):Null<{params:Array<TypeParameter>, expr:Null<TypedExpr>}>;
-
-	/**
-		The metadata of the variable.
-	**/
-	public var meta(default, never):Null<MetaAccess>;
-}
-
 /**
 	Represents a module type. These are the types that can be declared in a Haxe
 	module and which are passed to the generators (except `TTypeDecl`).
@@ -1017,6 +981,42 @@ enum TypedExprDef {
 	TIdent(s:String);
 }
 
+/**
+	Represents a variable in the typed AST.
+ */
+typedef TVar = {
+	/**
+		The unique ID of the variable.
+	**/
+	public var id(default, never):Int;
+
+	/**
+		The name of the variable.
+	**/
+	public var name(default, never):String;
+
+	/**
+		The type of the variable.
+	**/
+	public var t(default, never):Type;
+
+	/**
+		Whether or not the variable has been captured by a closure.
+	**/
+	public var capture(default, never):Bool;
+
+	/**
+		Special information which is internally used to keep track of closure.
+		information
+	**/
+	public var extra(default, never):Null<{params:Array<TypeParameter>, expr:Null<TypedExpr>}>;
+
+	/**
+		The metadata of the variable.
+	**/
+	public var meta(default, never):Null<MetaAccess>;
+}
+
 /**
 	Represents a typed AST node.
  */