瀏覽代碼

looks like we don't use pyFor anyway?

Simon Krajewski 11 年之前
父節點
當前提交
e5b2d78f34
共有 2 個文件被更改,包括 18 次插入18 次删除
  1. 4 4
      genpy.ml
  2. 14 14
      std/python/Syntax.hx

+ 4 - 4
genpy.ml

@@ -718,10 +718,10 @@ module Transformer = struct
 			let params = List.map (fun (p) -> p.a_expr) params in
 			let e = { a_expr with eexpr = TNew(c, tp, params) } in
 			lift false blocks e
-		| (_, TCall({ eexpr = TLocal({v_name = "__python_for__" })} as x, [param])) ->
+(* 		| (_, TCall({ eexpr = TLocal({v_name = "__python_for__" })} as x, [param])) ->
 			let param = trans false [] param in
 			let call = { a_expr with eexpr = TCall(x, [param.a_expr])} in
-			lift_expr call
+			lift_expr call *)
 		| (_, TCall(e, params)) ->
 			let e = trans true [] e in
 			let params = List.map (trans true []) params in
@@ -1222,11 +1222,11 @@ module Printer = struct
 				Printf.sprintf "%s[%s:]" (print_expr pctx e1) (print_exprs pctx ":" tail)
 			| "python_Syntax.isIn",[e1;e2] ->
 				Printf.sprintf "%s in %s" (print_expr pctx e1) (print_expr pctx e2)
-			| "__python_for__",[{eexpr = TBlock [{eexpr = TVar(v1,_)};e2;block]}] ->
+(* 			| "__python_for__",[{eexpr = TBlock [{eexpr = TVar(v1,_)};e2;block]}] ->
 				let f1 = v1.v_name in
 				let pctx = {pctx with pc_indent = "\t" ^ pctx.pc_indent} in
 				let i = pctx.pc_indent in
-				Printf.sprintf "for %s in %s:\n%s%s" f1 (print_expr pctx e2) i (print_expr pctx block)
+				Printf.sprintf "for %s in %s:\n%s%s" f1 (print_expr pctx e2) i (print_expr pctx block) *)
 			| "python_Syntax.delete",[e1] ->
 				Printf.sprintf "del %s" (print_expr pctx e1)
 			| "python_Syntax.binop",[e0;{eexpr = TConst(TString id)};e2] ->

+ 14 - 14
std/python/Syntax.hx

@@ -68,20 +68,20 @@ extern class Syntax {
 		return macro ((untyped __python_array_access_leading_colon__)($a{[x].concat(rest)}):Dynamic);
 	}
 
-	@:noUsing macro public static function pyFor <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 res = macro @:pos(it.pos) {
-			var $id = $it.getNativeIterator().__next__();
-			$it;
-			$b;
-		}
-		return macro ((untyped __python_for__)($res):Void);
-	}
+	//@:noUsing macro public static function pyFor <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 res = macro @:pos(it.pos) {
+			//var $id = $it.getNativeIterator().__next__();
+			//$it;
+			//$b;
+		//}
+		//return macro $self._pythonFor($res);
+	//}
 
 	@:noUsing macro public static function importFromAs (from:String, module:String, className : String):haxe.macro.Expr {