ExprRequire -> ExprOf + haxe3 transition

std/Std.hx

@@ -63,6 +63,6 @@ extern class Std {
 	public static function random( x : Int ) : Int;
 
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String>;
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String>;
 
 }

std/cpp/_std/Std.hx

@@ -48,7 +48,7 @@
 		return untyped __global__.rand() % x;
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Format.format(fmt);
 	}
 

std/flash/_std/Std.hx

@@ -53,7 +53,7 @@ import flash.Boot;
 		return untyped Math.floor(Math.random()*x);
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Format.format(fmt);
 	}
 

std/flash8/_std/Std.hx

@@ -57,7 +57,7 @@
 		return untyped __random__(x);
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Format.format(fmt);
 	}
 

std/haxe/macro/Expr.hx

@@ -83,7 +83,11 @@ typedef Expr = {
 	var pos : Position;
 }
 
+#if !haxe3
 typedef ExprRequire<T> = Expr;
+#end
+
+typedef ExprOf<T> = Expr;
 
 enum ExprDef {
 	EConst( c : Constant );

std/js/_std/Std.hx

@@ -56,7 +56,7 @@ import js.Boot;
 		return untyped Math.floor(Math.random()*x);
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Context.format(fmt);
 	}
 

std/neko/_std/Std.hx

@@ -60,7 +60,7 @@
 		return untyped Math._rand_int(Math.__rnd,x);
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Format.format(fmt);
 	}
 

std/php/_std/Std.hx

@@ -54,7 +54,7 @@
 		return untyped __call__("mt_rand", 0, x-1);
 	}
 
-	@:macro public static function format( fmt : haxe.macro.Expr.ExprRequire<String> ) : haxe.macro.Expr.ExprRequire<String> {
+	@:macro public static function format( fmt : haxe.macro.Expr.ExprOf<String> ) : haxe.macro.Expr.ExprOf<String> {
 		return haxe.macro.Context.format(fmt);
 	}
 }

std/sys/db/Manager.hx

@@ -84,23 +84,23 @@ class Manager<T : Object> {
 		return unsafeObjects("SELECT * FROM " + table_name,lock);
 	}
 
-	@:macro public function get(ethis,id,?lock:haxe.macro.Expr.ExprRequire<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprRequire<T> #end {
+	@:macro public function get(ethis,id,?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<T> #end {
 		return SpodMacros.macroGet(ethis,id,lock);
 	}
 
-	@:macro public function select(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprRequire<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprRequire<T> #end {
+	@:macro public function select(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<T> #end {
 		return SpodMacros.macroSearch(ethis, cond, options, lock, true);
 	}
 
-	@:macro public function search(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprRequire<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprRequire<List<T>> #end {
+	@:macro public function search(ethis, cond, ?options, ?lock:haxe.macro.Expr.ExprOf<Bool>) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<List<T>> #end {
 		return SpodMacros.macroSearch(ethis, cond, options, lock);
 	}
 
-	@:macro public function count(ethis, cond) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprRequire<Int> #end {
+	@:macro public function count(ethis, cond) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<Int> #end {
 		return SpodMacros.macroCount(ethis, cond);
 	}
 
-	@:macro public function delete(ethis, cond) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprRequire<Void> #end {
+	@:macro public function delete(ethis, cond) : #if macro haxe.macro.Expr #else haxe.macro.Expr.ExprOf<Void> #end {
 		return SpodMacros.macroDelete(ethis, cond);
 	}
 

typeload.ml

@@ -967,8 +967,8 @@ let init_class ctx c p herits fields =
 			else
 				let tdyn = Some (CTPath { tpackage = []; tname = "Dynamic"; tparams = []; tsub = None }) in
 				let to_dyn = function
-					| { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some "ExprRequire"; tparams = [TPType t] } -> Some t
-					| { tpackage = []; tname = "ExprRequire"; tsub = None; tparams = [TPType t] } -> Some t
+					| { tpackage = ["haxe";"macro"]; tname = "Expr"; tsub = Some ("ExprRequire"|"ExprOf"); tparams = [TPType t] } -> Some t
+					| { tpackage = []; tname = ("ExprRequire"|"ExprOf"); tsub = None; tparams = [TPType t] } -> Some t
 					| _ -> tdyn
 				in
 				{