[python] extract macro methods rfom python.Syntax into Syntax.macro.hx (fixes #9256)

std/python/Syntax.hx

@@ -22,41 +22,22 @@
 
 package python;
 
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.ExprTools;
-#end
 import haxe.extern.Rest;
 
 @:noPackageRestrict
 @:noClosure
 extern class Syntax {
-	#if macro
-	static var self = macro python.Syntax;
-	#end
 
-	@:noUsing macro public static function importModule(module:String):haxe.macro.Expr {
-		return macro($self.code($v{"import " + module}) : Void);
-	}
+	@:noUsing macro public static function importModule(module:String):haxe.macro.Expr;
 
-	@:noUsing macro public static function importAs(module:String, className:String):haxe.macro.Expr {
-		var n = className.split(".").join("_");
-		var e = "import " + module + " as " + n;
+	@:noUsing macro public static function importAs(module:String, className:String):haxe.macro.Expr;
 
-		return macro($self.code($v{e}) : Void);
-	}
-
-	#if !macro
 	@:overload(function(className:String, args:Rest<Dynamic>):Dynamic {})
 	static function construct<T>(cls:Class<T>, args:Rest<Dynamic>):T;
-	#end
 
 	@:noUsing
 	@:deprecated("python.Syntax.newInstance() is deprecated. Use python.Syntax.construct() instead.")
-	macro public static function newInstance(c:Expr, params:Array<Expr>):haxe.macro.Expr {
-		return macro $self._newInstance($c, $a{params});
-	}
+	macro public static function newInstance(c:haxe.macro.Expr, params:Array<haxe.macro.Expr>):haxe.macro.Expr;
 
 	extern static function _newInstance(c:Dynamic, args:Array<Dynamic>):Dynamic;
 
@@ -72,31 +53,20 @@ extern class Syntax {
 	@:noUsing
 	extern static function assign(a:Dynamic, b:Dynamic):Void;
 
-	#if !macro
 	static function code(code:String, args:Rest<Dynamic>):Dynamic;
-	#end
 
 	@:noUsing
 	@:deprecated("python.Syntax.pythonCode() is deprecated. Use python.Syntax.code() instead.")
-	macro public static function pythonCode(b:ExprOf<String>, rest:Array<Expr>):Expr {
-		if (rest == null)
-			rest = [];
-		return macro @:pos(Context.currentPos()) untyped $self._pythonCode($b, $a{rest});
-	};
+	macro public static function pythonCode(b:ExprOf<String>, rest:Array<haxe.macro.Expr>):haxe.macro.Expr;
 
-	#if !macro
 	@:noUsing
 	static function _pythonCode<T>(b:String, args:Array<Dynamic>):T;
-	#end
+
 	@:noUsing
-	macro public static function arrayAccess(x:Expr, rest:Array<Expr>):ExprOf<Dynamic> {
-		return macro $self._arrayAccess($x, $a{rest});
-	}
+	macro public static function arrayAccess(x:haxe.macro.Expr, rest:Array<haxe.macro.Expr>):haxe.macro.Expr.ExprOf<Dynamic>;
 
 	@:noUsing
-	macro public static function arrayAccessWithTrailingColon(x:Expr, rest:Array<Expr>):ExprOf<Dynamic> {
-		return macro $self._arrayAccess($x, $a{rest}, true);
-	}
+	macro public static function arrayAccessWithTrailingColon(x:haxe.macro.Expr, rest:Array<haxe.macro.Expr>):haxe.macro.Expr.ExprOf<Dynamic>;
 
 	extern static function _arrayAccess(a:Dynamic, args:Array<Dynamic>, ?trailingColon:Bool = false):Dynamic;
 
@@ -106,38 +76,12 @@ extern class Syntax {
 	extern static function _foreach(id:Dynamic, it:Dynamic, block:Dynamic):Dynamic;
 
 	@:noUsing
-	macro public static function foreach<T>(v:Expr, it:Expr, b:Expr):haxe.macro.Expr {
-		var id = switch (v.expr) {
-			case EConst(CIdent(x)): x;
-			case _: Context.error("unexpected " + ExprTools.toString(v) + ": const ident expected", v.pos);
-		}
-
-		var iter = try {
-			var it = macro($it.__iter__() : python.NativeIterator.NativeIteratorRaw<T>);
-			Context.typeof(it);
-			it;
-		} catch (e:Dynamic) {
-			macro($it : python.NativeIterable.NativeIterableRaw<T>);
-		}
-
-		return macro {
-			var $id = null;
-			$self._foreach($v, $it, cast $b);
-		}
-	}
-
-	@:noUsing macro public static function importFromAs(from:String, module:String, className:String):haxe.macro.Expr {
-		var n = className.split(".").join("_");
-
-		var e = "from " + from + " import " + module + " as " + n;
-
-		return macro($self.code($v{e}) : Void);
-	}
+	macro public static function foreach<T>(v:haxe.macro.Expr, it:haxe.macro.Expr, b:haxe.macro.Expr):haxe.macro.Expr;
+
+	@:noUsing macro public static function importFromAs(from:String, module:String, className:String):haxe.macro.Expr;
 
 	@:noUsing
-	macro public static function callField(o:Expr, field:ExprOf<String>, params:Array<Expr>):haxe.macro.Expr {
-		return macro @:pos(o.pos) $self.call($self.field($o, $field), $a{params});
-	}
+	macro public static function callField(o:haxe.macro.Expr, field:haxe.macro.Expr.ExprOf<String>, params:Array<haxe.macro.Expr>):haxe.macro.Expr;
 
 	extern static function call(e:Dynamic, args:Array<Dynamic>):Dynamic;
 
@@ -145,19 +89,14 @@ extern class Syntax {
 	extern static function field(o:Dynamic, field:String):Dynamic;
 
 	@:noUsing
-	macro public static function tuple(args:Array<Expr>):Dynamic {
-		var args = macro $a{args};
-		return macro $self._tuple($args);
-	}
+	macro public static function tuple(args:Array<haxe.macro.Expr>):haxe.macro.Expr;
 
 	extern static function _tuple(args:Array<Dynamic>):Dynamic;
 
 	@:noUsing
 	extern static function varArgs(args:Array<Dynamic>):Dynamic;
 
-	macro public static function callNamedUntyped(e:Expr, args:Expr):Expr {
-		return macro @:pos(e.pos) $self._callNamedUntyped($e, $args);
-	}
+	macro public static function callNamedUntyped(e:haxe.macro.Expr, args:haxe.macro.Expr):haxe.macro.Expr;
 
 	extern static function _callNamedUntyped(e:Dynamic, args:Dynamic):Dynamic;
 

std/python/Syntax.macro.hx

@@ -0,0 +1,113 @@
+/*
+ * Copyright (C)2005-2019 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package python;
+
+import haxe.macro.Expr;
+import haxe.macro.Context;
+import haxe.macro.ExprTools;
+
+@:noPackageRestrict
+@:noClosure
+class Syntax {
+	@:noUsing
+	macro public static function importModule(module:String):Expr {
+		return macro python.Syntax.code($v{"import " + module});
+	}
+
+	@:noUsing
+	macro public static function importAs(module:String, className:String):ExprOf<Void> {
+		var n = className.split(".").join("_");
+		var e = "import " + module + " as " + n;
+
+		return macro python.Syntax.code($v{e});
+	}
+
+	@:noUsing
+	@:deprecated("python.Syntax.newInstance() is deprecated. Use python.Syntax.construct() instead.")
+	macro public static function newInstance(c:Expr, params:Array<Expr>):Expr {
+		return macro python.Syntax._newInstance($c, $a{params});
+	}
+
+	@:noUsing
+	@:deprecated("python.Syntax.pythonCode() is deprecated. Use python.Syntax.code() instead.")
+	macro public static function pythonCode(b:ExprOf<String>, rest:Array<Expr>):Expr {
+		if (rest == null)
+			rest = [];
+		return macro @:pos(Context.currentPos()) untyped python.Syntax._pythonCode($b, $a{rest});
+	}
+
+	@:noUsing
+	macro public static function arrayAccess(x:Expr, rest:Array<Expr>):ExprOf<Dynamic> {
+		return macro python.Syntax._arrayAccess($x, $a{rest});
+	}
+
+	@:noUsing
+	macro public static function arrayAccessWithTrailingColon(x:Expr, rest:Array<Expr>):ExprOf<Dynamic> {
+		return macro python.Syntax._arrayAccess($x, $a{rest}, true);
+	}
+
+	@:noUsing
+	macro public static function foreach<T>(v:Expr, it:Expr, b:Expr):Expr {
+		var id = switch (v.expr) {
+			case EConst(CIdent(x)): x;
+			case _: Context.error("unexpected " + ExprTools.toString(v) + ": const ident expected", v.pos);
+		}
+
+		var iter = try {
+			var it = macro($it.__iter__() : python.NativeIterator.NativeIteratorRaw<T>);
+			Context.typeof(it);
+			it;
+		} catch (e:Dynamic) {
+			macro($it : python.NativeIterable.NativeIterableRaw<T>);
+		}
+
+		return macro {
+			var $id = null;
+			python.Syntax._foreach($v, $it, cast $b);
+		}
+	}
+
+	@:noUsing
+	macro public static function importFromAs(from:String, module:String, className:String):ExprOf<Void> {
+		var n = className.split(".").join("_");
+
+		var e = "from " + from + " import " + module + " as " + n;
+
+		return macro python.Syntax.code($v{e});
+	}
+
+	@:noUsing
+	macro public static function callField(o:Expr, field:ExprOf<String>, params:Array<Expr>):Expr {
+		return macro @:pos(o.pos) python.Syntax.call(python.Syntax.field($o, $field), $a{params});
+	}
+
+	@:noUsing
+	macro public static function tuple(args:Array<Expr>):Dynamic {
+		var args = macro $a{args};
+		return macro python.Syntax._tuple($args);
+	}
+
+	macro public static function callNamedUntyped(e:Expr, args:Expr):Expr {
+		return macro @:pos(e.pos) python.Syntax._callNamedUntyped($e, $args);
+	}
+}

tests/misc/python/projects/Issue9256/Main.hx

@@ -0,0 +1,7 @@
+class Main {
+	public static function main(){
+		python.Syntax.importModule("numpy");
+		python.Syntax.importAs("pandas", "pd");
+		python.Syntax.importFromAs("sklearn", "metrics", "metrics");
+	}
+}

tests/misc/python/projects/Issue9256/build.hxml

@@ -0,0 +1,2 @@
+-python bin/test.py
+--main Main