Merge branch 'master' of https://github.com/HaxeFoundation/as3hx into…

… develop
HaxeFoundation · Nov 21, 2017 · f46c7f9 · f46c7f9
2 parents d79cf07 + 1b60f05
commit f46c7f9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/haxelib.json b/haxelib.json
@@ -7,6 +7,6 @@
   "version": "1.0.6",
   "classPath": "src",
   "releasenote": "Continued improvements",
-  "contributors": [ "singmajesty" ],
+  "contributors": [ "singmajesty", "mastef" ],
   "dependencies": {}
 }
diff --git a/src/as3hx/Writer.hx b/src/as3hx/Writer.hx
@@ -34,6 +34,7 @@ class Writer
     var context : Map<String,String>;
     var contextStack : Array<Map<String,String>>;
     var inArrayAccess : Bool;
+    var inEField : Bool;
     var inE4XFilter : Bool;
     var inLvalAssign : Bool; // current expr is lvalue in assignment (expr = valOfSomeSort)
     var rvalue : Expr;
@@ -51,6 +52,7 @@ class Writer
         this.context = new Map();
         this.contextStack = new Array();
         this.inArrayAccess = false;
+        this.inEField = false;
         this.inE4XFilter = false;
         this.inLvalAssign = false;
         this.lineIsDirty = false;
@@ -1008,7 +1010,7 @@ class Writer
                 var isString = (itype == "String");
                 var oldInLVA = inLvalAssign;
                 inLvalAssign = false;
-                if(oldInLVA)
+                if(oldInLVA && !inEField)
                     write("Reflect.setField(");
                 else
                     write("Reflect.field(");
@@ -1018,7 +1020,7 @@ class Writer
                 if(!isString) write("Std.string(");
                 writeExpr(index);
                 if(!isString) write(")");
-                if(oldInLVA) {
+                if(oldInLVA && !inEField) {
                     write(", ");
                     writeExpr(rvalue);
                     rvalue = null;
@@ -1548,6 +1550,7 @@ class Writer
             write(".node");
             write("." + f + ".innerData");
         } else {
+            inEField = true;
             switch(e) {
                 case EField(e2, f2):
                     //write("/* -- " +e2+ " " +getExprType(e2)+" */");
@@ -1596,6 +1599,7 @@ class Writer
             writeExpr(e);
             write("." + f);
         }
+        inEField = false;
         inArrayAccess = old;
         return Semi;
     }

diff --git a/test/issues/Issue314.as b/test/issues/Issue314.as
@@ -0,0 +1,15 @@
+package {
+    public class Issue303 {
+        public function Issue303() {}
+        public function hide1(param1:*) : *
+        {
+            this[param1] = false;
+            this[param1].visible = false;
+        }
+        public function hide2(param1:*) : *
+        {
+            this[param1] = "nothing";
+            this[param1].collision.currentObject = "nothing";
+        }
+    }
+}
diff --git a/test/issues/Issue314.hx b/test/issues/Issue314.hx
@@ -0,0 +1,17 @@
+
+class Issue303
+{
+    public function new()
+    {
+    }
+    public function hide1(param1 : Dynamic) : Dynamic
+    {
+        Reflect.setField(this, Std.string(param1), false);
+        Reflect.field(this, Std.string(param1)).visible = false;
+    }
+    public function hide2(param1 : Dynamic) : Dynamic
+    {
+        Reflect.setField(this, Std.string(param1), "nothing");
+        Reflect.field(this, Std.string(param1)).collision.currentObject = "nothing";
+    }
+}
diff --git a/test/unit/as3hx/AS3HXTest.hx b/test/unit/as3hx/AS3HXTest.hx
@@ -561,6 +561,11 @@ class AS3HXTest {
         generate("Issue303.as", "Issue303.hx");
     }
 
+    @Test("this[param1].something = false")
+    public function issue314() {
+        generate("Issue314.as", "Issue314.hx");
+    }
+
     function generate(as3FileName:String, expectedHaxeFileName:String) {
         var issuesDirectory = FileSystem.absolutePath("test/issues");
         var generatedDirectoryPath = '$issuesDirectory/generated';