fix #9

tests/issues/Issue9.hx

@@ -0,0 +1,31 @@
+package issues;
+import utest.*;
+
+class Issue9 extends Test {
+
+	public var array = [1,2,3];
+
+	function testIssue5 () {
+		new A(this);
+	}
+
+}
+
+@:yield
+class A {
+
+	private var external:Issue9;
+
+	public function new(v) {
+		external = v;
+		iterator().next();
+		Assert.pass();
+	}
+
+	function iterator() : Iterator<Dynamic>
+	{
+		for (i in external.array) {}
+
+		@yield break;
+	}
+}

yield/generators/DefaultGenerator.hx

@@ -660,12 +660,14 @@ class DefaultGenerator {
 							if (_data.names[0] == null) {
 								eRef.expr = EField( {expr: EConst(CIdent('this')), pos: eRef.pos}, parentFieldName );
 							} else {
-
+
+								var fieldName:String = NameController.localVar(_data.names[0], _defData.scope, _defData.channel, _defData.env.getParentCount() + 1);
+
 								var lfield:Expr = {
 									expr: EField({
 										expr: EField( {expr: EConst(CIdent('this')), pos: eRef.pos}, parentFieldName ),
 										pos : eRef.pos
-									}, _data.names[0] ),
+									}, fieldName ),
 									pos: eRef.pos
 								};
 
@@ -954,7 +956,7 @@ class DefaultGenerator {
 			#end;
 			return mapping == null ? e : macro @:pos(e.pos) @:mergeBlock {
 				$mapping;
-				$e;
+				${{ expr: e.expr, pos: e.pos }};
 			};
 		}